From: Takashi Iwai Date: Mon, 7 Jan 2013 14:36:45 +0000 (+0100) Subject: ALSA: hda - Don't set up active streams twice X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=affdb62b815b38261f09f9d4ec210a35c7ffb1f3;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git ALSA: hda - Don't set up active streams twice We don't have to set up a stream that has been already set up previously. Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 7eab3ae5ab6d..733bce62670c 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -1493,7 +1493,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) + if (!p || p->active) return; if (codec->pcm_format_first) @@ -1540,7 +1540,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) { + if (p && p->active) { /* 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()