Update of /cvsroot/alsa/alsa-kernel/usb
In directory sc8-pr-cvs1:/tmp/cvs-serv9826
Modified Files:
usbaudio.c
Log Message:
don't call usb_set_configuration() for the same device multiple times.
Index: usbaudio.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/usb/usbaudio.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- usbaudio.c 17 Jul 2003 17:42:25 -0000 1.60
+++ usbaudio.c 18 Jul 2003 13:11:59 -0000 1.61
@@ -2723,11 +2723,6 @@
if (quirk && quirk->ifnum != QUIRK_ANY_INTERFACE && ifnum != quirk->ifnum)
goto __err_val;
- if (usb_set_configuration(dev, get_cfg_desc(config)->bConfigurationValue) < 0)
{
- snd_printk(KERN_ERR "cannot set configuration (value 0x%x)\n",
get_cfg_desc(config)->bConfigurationValue);
- goto __err_val;
- }
-
/* SB Extigy needs special boot-up sequence */
/* if more models come, this will go to the quirk list. */
if (dev->descriptor.idVendor == 0x041e && dev->descriptor.idProduct == 0x3000)
{
@@ -2757,6 +2752,11 @@
/* it's a fresh one.
* now look for an empty slot and create a new card instance
*/
+ /* first, set the current configuration for this device */
+ if (usb_set_configuration(dev,
get_cfg_desc(config)->bConfigurationValue) < 0) {
+ snd_printk(KERN_ERR "cannot set configuration (value 0x%x)\n",
get_cfg_desc(config)->bConfigurationValue);
+ goto __error;
+ }
for (i = 0; i < SNDRV_CARDS; i++)
if (enable[i] && ! usb_chip[i] &&
(vid[i] == -1 || vid[i] == dev->descriptor.idVendor) &&
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines at the
same time. Free trial click here: http://www.vmware.com/wl/offer/345/0
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
