git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
omap2+: add drm device
[pandora-kernel.git]
/
sound
/
usb
/
quirks.c
diff --git
a/sound/usb/quirks.c
b/sound/usb/quirks.c
index
a3ddac0
..
1b275f0
100644
(file)
--- a/
sound/usb/quirks.c
+++ b/
sound/usb/quirks.c
@@
-383,11
+383,13
@@
static int snd_usb_fasttrackpro_boot_quirk(struct usb_device *dev)
* rules
*/
err = usb_driver_set_configuration(dev, 2);
* rules
*/
err = usb_driver_set_configuration(dev, 2);
- if (err < 0)
{
+ if (err < 0)
snd_printdd("error usb_driver_set_configuration: %d\n",
err);
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");
} else
snd_printk(KERN_INFO "usb-audio: Fast Track Pro config OK\n");