diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-25 07:38:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-07 19:57:25 -0700 |
| commit | 430c701136b9168fbb63b6391af0b8f4216817a9 (patch) | |
| tree | c9c54005568ba3ac72b45e15b6498c9e79bd571d | |
| parent | 7d4dcfcf2e4351369720bbd8e6a65df56e0458d7 (diff) | |
| download | kernel_samsung_smdk4412-430c701136b9168fbb63b6391af0b8f4216817a9.tar.gz kernel_samsung_smdk4412-430c701136b9168fbb63b6391af0b8f4216817a9.tar.bz2 kernel_samsung_smdk4412-430c701136b9168fbb63b6391af0b8f4216817a9.zip | |
ALSA: usb-audio: Fix autopm error during probing
commit 60af3d037eb8c670dcce31401501d1271e7c5d95 upstream.
We've got strange errors in get_ctl_value() in mixer.c during
probing, e.g. on Hercules RMX2 DJ Controller:
ALSA mixer.c:352 cannot get ctl value: req = 0x83, wValue = 0x201, wIndex = 0xa00, type = 4
ALSA mixer.c:352 cannot get ctl value: req = 0x83, wValue = 0x200, wIndex = 0xa00, type = 4
....
It turned out that the culprit is autopm: snd_usb_autoresume() returns
-ENODEV when called during card->probing = 1.
Since the call itself during card->probing = 1 is valid, let's fix the
return value of snd_usb_autoresume() as success.
Reported-and-tested-by: Daniel Schürmann <daschuer@mixxx.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | sound/usb/card.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 8d0a3c145e6..ce29d870c1d 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -610,7 +610,9 @@ int snd_usb_autoresume(struct snd_usb_audio *chip) int err = -ENODEV; down_read(&chip->shutdown_rwsem); - if (!chip->shutdown && !chip->probing) + if (chip->probing) + err = 0; + else if (!chip->shutdown) err = usb_autopm_get_interface(chip->pm_intf); up_read(&chip->shutdown_rwsem); |