diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-05-10 13:39:50 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-05-10 13:41:37 +0200 |
| commit | 6c35ae3c327ef4b5f51d3428d2ba47ac2153e882 (patch) | |
| tree | 92db5a0674b4a913b5ec7fed34dfd455408ad856 /sound | |
| parent | d24f5a9ad9febffa53b1d3fcdf36c9a2283d848e (diff) | |
| download | linux-6c35ae3c327ef4b5f51d3428d2ba47ac2153e882.tar.gz linux-6c35ae3c327ef4b5f51d3428d2ba47ac2153e882.tar.bz2 linux-6c35ae3c327ef4b5f51d3428d2ba47ac2153e882.zip | |
Revert "ALSA: hda - Don't set up active streams twice"
This reverts commit affdb62b815b38261f09f9d4ec210a35c7ffb1f3.
The commit introduced a regression with AD codecs where the stream is
always clean up. Since the patch is just a minor optimization and
reverting the commit fixes the issue, let's just revert it.
Reported-and-tested-by: Michael Burian <michael.burian@sbg.at>
Cc: <stable@vger.kernel.org> [v3.9+]
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 86674f67abd1..55108b5fb291 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -1583,7 +1583,7 @@ void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid, "NID=0x%x, stream=0x%x, channel=%d, format=0x%x\n", nid, stream_tag, channel_id, format); p = get_hda_cvt_setup(codec, nid); - if (!p || p->active) + if (!p) return; if (codec->pcm_format_first) @@ -1630,7 +1630,7 @@ void __snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid, snd_printdd("hda_codec_cleanup_stream: NID=0x%x\n", nid); p = get_hda_cvt_setup(codec, nid); - if (p && p->active) { + if (p) { /* here we just clear the active flag when do_now isn't set; * actual clean-ups will be done later in * purify_inactive_streams() called from snd_hda_codec_prpapre() |