Skip to content

L
linux
Commit 4ccbe94c authored by Thomas Sailer's avatar Thomas Sailer Committed by Greg Kroah-Hartman
Browse files
Options

[PATCH] USB: USB OSS audio driver workaround for buggy descriptors

parent f285ff9b
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 9 deletions
drivers/usb/class/audio.c
View file @ 4ccbe94c
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
/* /*
* audio.c -- USB Audio Class driver * audio.c -- USB Audio Class driver
* *
* Copyright (C) 1999, 2000, 2001 * Copyright (C) 1999, 2000, 2001, 2003, 2004
* Alan Cox (alan@lxorguk.ukuu.org.uk) * Alan Cox (alan@lxorguk.ukuu.org.uk)
* Thomas Sailer (sailer@ife.ee.ethz.ch) * Thomas Sailer (sailer@ife.ee.ethz.ch)
* *
...@@ -101,6 +101,8 @@ ...@@ -101,6 +101,8 @@
* Fix SNDCTL_DSP_STEREO API violation * Fix SNDCTL_DSP_STEREO API violation
* 2003-04-08: Oliver Neukum (oliver@neukum.name): * 2003-04-08: Oliver Neukum (oliver@neukum.name):
* Setting a configuration is done by usbcore and must not be overridden * Setting a configuration is done by usbcore and must not be overridden
* 2004-02-27: Workaround for broken synch descriptors
*
*/ */
/* /*
...@@ -1542,13 +1544,14 @@ static int set_format_in(struct usb_audiodev *as) ...@@ -1542,13 +1544,14 @@ static int set_format_in(struct usb_audiodev *as)
alts->endpoint[1].desc.bmAttributes != 0x01 || alts->endpoint[1].desc.bmAttributes != 0x01 ||
alts->endpoint[1].desc.bSynchAddress != 0 || alts->endpoint[1].desc.bSynchAddress != 0 ||
alts->endpoint[1].desc.bEndpointAddress != (alts->endpoint[0].desc.bSynchAddress & 0x7f)) { alts->endpoint[1].desc.bEndpointAddress != (alts->endpoint[0].desc.bSynchAddress & 0x7f)) {
printk(KERN_ERR "usbaudio: device %d interface %d altsetting %d invalid synch pipe\n", printk(KERN_WARNING "usbaudio: device %d interface %d altsetting %d claims adaptive in "
"but has invalid synch pipe; treating as asynchronous in\n",
dev->devnum, u->interface, fmt->altsetting); dev->devnum, u->interface, fmt->altsetting);
return -1; } else {
}
u->syncpipe = usb_sndisocpipe(dev, alts->endpoint[1].desc.bEndpointAddress & 0xf); u->syncpipe = usb_sndisocpipe(dev, alts->endpoint[1].desc.bEndpointAddress & 0xf);
u->syncinterval = alts->endpoint[1].desc.bRefresh; u->syncinterval = alts->endpoint[1].desc.bRefresh;
} }
}
if (d->srate < fmt->sratelo) if (d->srate < fmt->sratelo)
d->srate = fmt->sratelo; d->srate = fmt->sratelo;
if (d->srate > fmt->sratehi) if (d->srate > fmt->sratehi)
...@@ -1637,13 +1640,14 @@ static int set_format_out(struct usb_audiodev *as) ...@@ -1637,13 +1640,14 @@ static int set_format_out(struct usb_audiodev *as)
alts->endpoint[1].desc.bmAttributes != 0x01 || alts->endpoint[1].desc.bmAttributes != 0x01 ||
alts->endpoint[1].desc.bSynchAddress != 0 || alts->endpoint[1].desc.bSynchAddress != 0 ||
alts->endpoint[1].desc.bEndpointAddress != (alts->endpoint[0].desc.bSynchAddress | 0x80)) { alts->endpoint[1].desc.bEndpointAddress != (alts->endpoint[0].desc.bSynchAddress | 0x80)) {
printk(KERN_ERR "usbaudio: device %d interface %d altsetting %d invalid synch pipe\n", printk(KERN_WARNING "usbaudio: device %d interface %d altsetting %d claims asynch out "
"but has invalid synch pipe; treating as adaptive out\n",
dev->devnum, u->interface, fmt->altsetting); dev->devnum, u->interface, fmt->altsetting);
return -1; } else {
}
u->syncpipe = usb_rcvisocpipe(dev, alts->endpoint[1].desc.bEndpointAddress & 0xf); u->syncpipe = usb_rcvisocpipe(dev, alts->endpoint[1].desc.bEndpointAddress & 0xf);
u->syncinterval = alts->endpoint[1].desc.bRefresh; u->syncinterval = alts->endpoint[1].desc.bRefresh;
} }
}
if (d->srate < fmt->sratelo) if (d->srate < fmt->sratelo)
d->srate = fmt->sratelo; d->srate = fmt->sratelo;
if (d->srate > fmt->sratehi) if (d->srate > fmt->sratehi)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7