summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-04-25 07:38:15 +0200
committerTakashi Iwai <tiwai@suse.de>2013-04-25 07:46:51 +0200
commit60af3d037eb8c670dcce31401501d1271e7c5d95 (patch)
treed3399aae19493e16cec50d613c1f0d72732e4028 /sound
parentebfc594c02148b6a85c2f178cf167a44a3c3ce10 (diff)
downloadlinux-60af3d037eb8c670dcce31401501d1271e7c5d95.tar.gz
linux-60af3d037eb8c670dcce31401501d1271e7c5d95.tar.bz2
linux-60af3d037eb8c670dcce31401501d1271e7c5d95.zip
ALSA: usb-audio: Fix autopm error during probing
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> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/card.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c
index 5254b18cedcd..1a033177b83f 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -631,7 +631,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);