From fc8cac928ffce52bf36dd96e1cac9315ad49fd79 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 10 May 2013 13:39:50 +0200 Subject: [PATCH] --- yaml --- r: 375241 b: refs/heads/master c: 6c35ae3c327ef4b5f51d3428d2ba47ac2153e882 h: refs/heads/master i: 375239: a7417e1101b523af73169104bf892a4bf926ff20 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_codec.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5b52f9230227..55b178d60830 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d24f5a9ad9febffa53b1d3fcdf36c9a2283d848e +refs/heads/master: 6c35ae3c327ef4b5f51d3428d2ba47ac2153e882 diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c index 86674f67abd1..55108b5fb291 100644 --- a/trunk/sound/pci/hda/hda_codec.c +++ b/trunk/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()