ALSA: usb-audio: add a workaround for the NuForce UDH-100
The NuForce UDH-100 numbers its interfaces incorrectly, which makes the interface associations come out wrong, which results in the driver erroring out with the message "Audio class v2 interfaces need an interface association". Work around this by searching for the interface association descriptor also in some other place where it might have ended up. Reported-and-tested-by: Dave Helstroom <helstroom@google.com> Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Родитель
2e9b9a3c24
Коммит
281a6ac0f5
|
@ -243,6 +243,21 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)
|
|||
struct usb_interface_assoc_descriptor *assoc =
|
||||
usb_ifnum_to_if(dev, ctrlif)->intf_assoc;
|
||||
|
||||
if (!assoc) {
|
||||
/*
|
||||
* Firmware writers cannot count to three. So to find
|
||||
* the IAD on the NuForce UDH-100, also check the next
|
||||
* interface.
|
||||
*/
|
||||
struct usb_interface *iface =
|
||||
usb_ifnum_to_if(dev, ctrlif + 1);
|
||||
if (iface &&
|
||||
iface->intf_assoc &&
|
||||
iface->intf_assoc->bFunctionClass == USB_CLASS_AUDIO &&
|
||||
iface->intf_assoc->bFunctionProtocol == UAC_VERSION_2)
|
||||
assoc = iface->intf_assoc;
|
||||
}
|
||||
|
||||
if (!assoc) {
|
||||
snd_printk(KERN_ERR "Audio class v2 interfaces need an interface association\n");
|
||||
return -EINVAL;
|
||||
|
|
Загрузка…
Ссылка в новой задаче