diff options
| -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, | |||
| 1583 | "NID=0x%x, stream=0x%x, channel=%d, format=0x%x\n", | 1583 | "NID=0x%x, stream=0x%x, channel=%d, format=0x%x\n", |
| 1584 | nid, stream_tag, channel_id, format); | 1584 | nid, stream_tag, channel_id, format); |
| 1585 | p = get_hda_cvt_setup(codec, nid); | 1585 | p = get_hda_cvt_setup(codec, nid); |
| 1586 | if (!p || p->active) | 1586 | if (!p) |
| 1587 | return; | 1587 | return; |
| 1588 | 1588 | ||
| 1589 | if (codec->pcm_format_first) | 1589 | if (codec->pcm_format_first) |
| @@ -1630,7 +1630,7 @@ void __snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid, | |||
| 1630 | 1630 | ||
| 1631 | snd_printdd("hda_codec_cleanup_stream: NID=0x%x\n", nid); | 1631 | snd_printdd("hda_codec_cleanup_stream: NID=0x%x\n", nid); |
| 1632 | p = get_hda_cvt_setup(codec, nid); | 1632 | p = get_hda_cvt_setup(codec, nid); |
| 1633 | if (p && p->active) { | 1633 | if (p) { |
| 1634 | /* here we just clear the active flag when do_now isn't set; | 1634 | /* here we just clear the active flag when do_now isn't set; |
| 1635 | * actual clean-ups will be done later in | 1635 | * actual clean-ups will be done later in |
| 1636 | * purify_inactive_streams() called from snd_hda_codec_prpapre() | 1636 | * purify_inactive_streams() called from snd_hda_codec_prpapre() |
