diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-07-08 09:22:10 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-07-08 09:27:56 +0200 |
| commit | d1f15e06b2af57228d11e33e06a172ff58f5bc1c (patch) | |
| tree | 33fed3c2c6db96af504cc28ed89d60f1d243ab47 /sound | |
| parent | e828b23734bfebe30e95964302bbb801d02fddf6 (diff) | |
| download | linux-stable-d1f15e06b2af57228d11e33e06a172ff58f5bc1c.tar.gz linux-stable-d1f15e06b2af57228d11e33e06a172ff58f5bc1c.tar.bz2 linux-stable-d1f15e06b2af57228d11e33e06a172ff58f5bc1c.zip | |
ALSA: hda - Fix a wrong busy check in alt PCM open
Currently, the alt PCM open callback returns -EBUSY when an
independent HP is turned off, supposing that it conflicts with the
main PCM. However, obviously, this check is wrong when the
independent HP itself isn't enabled but the alt PCM was explicitly
created via alc_dac_nid by a codec driver.
Reported-and-tested-by: Kailang Yang <kailang@realtek.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index ac0db1679f09..b077bb644434 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -5175,7 +5175,7 @@ static int alt_playback_pcm_open(struct hda_pcm_stream *hinfo, int err = 0; mutex_lock(&spec->pcm_mutex); - if (!spec->indep_hp_enabled) + if (spec->indep_hp && !spec->indep_hp_enabled) err = -EBUSY; else spec->active_streams |= 1 << STREAM_INDEP_HP; |