diff options
| author | David Henningsson <david.henningsson@canonical.com> | 2013-01-04 17:02:18 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-14 10:03:03 +0100 |
| commit | b98ae2729dea161edc96c9d177459b6c28bcbba5 (patch) | |
| tree | 6467e4a5870af8b04ac4e2b38a569ba2f4e689e9 /sound | |
| parent | ALSA: usb-audio: Fix NULL dereference by access to non-existing substream (diff) | |
| download | linux-b98ae2729dea161edc96c9d177459b6c28bcbba5.tar.xz linux-b98ae2729dea161edc96c9d177459b6c28bcbba5.zip | |
ALSA: usb - fix race in creation of M-Audio Fast track pro driver
A patch in the 3.2 kernel caused regression with hotplugging the
M-Audio Fast track pro, or sound after suspend. I don't have the
device so I haven't done a full analysis, but it seems userspace
(both udev and pulseaudio) got confused when a card was created,
immediately destroyed, and then created again.
However, at least one person in the bug report (martin djfun)
reports that this patch resolves the issue for him. It also leaves
a message in the log:
"snd-usb-audio: probe of 1-1.1:1.1 failed with error -5" which is
a bit misleading. It is better than non-working audio, but maybe
there's a more elegant solution?
BugLink: https://bugs.launchpad.net/bugs/1095315
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/quirks.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index acc12f004c23..e71fc8bc3a70 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -387,11 +387,13 @@ static int snd_usb_fasttrackpro_boot_quirk(struct usb_device *dev) * rules */ err = usb_driver_set_configuration(dev, 2); - if (err < 0) { + if (err < 0) snd_printdd("error usb_driver_set_configuration: %d\n", err); - return -ENODEV; - } + /* Always return an error, so that we stop creating a device + that will just be destroyed and recreated with a new + configuration */ + return -ENODEV; } else snd_printk(KERN_INFO "usb-audio: Fast Track Pro config OK\n"); |