UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: usbmixer: bail out early when parsing audio class v2 descriptors 

This is just a quick hack that needs to be removed once the new units
defined by the audio class v2.0 standard are supported.

However, it allows using these devices for now, without mixer support.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Daniel Mack 2010-02-22 23:49:12 +01:00 committed by Takashi Iwai
parent 53ee98fe8a
commit 7b8a043f26
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/usb/usbmixer.c
View File

@ -2258,7 +2258,8 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif,
}; };
struct usb_mixer_interface *mixer; struct usb_mixer_interface *mixer;
struct snd_info_entry *entry; struct snd_info_entry *entry;
int err; struct usb_host_interface *host_iface;
int err, protocol;
strcpy(chip->card->mixername, "USB Mixer"); strcpy(chip->card->mixername, "USB Mixer");
@ -2275,6 +2276,16 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif,
return -ENOMEM; return -ENOMEM;
} }
host_iface = &usb_ifnum_to_if(chip->dev, ctrlif)->altsetting[0];
protocol = host_iface->desc.bInterfaceProtocol;
/* FIXME! */
if (protocol != UAC_VERSION_1) {
snd_printk(KERN_WARNING "mixer interface protocol 0x%02x not yet supported\n",
protocol);
return 0;
}
if ((err = snd_usb_mixer_controls(mixer)) < 0 || if ((err = snd_usb_mixer_controls(mixer)) < 0 ||
(err = snd_usb_mixer_status_create(mixer)) < 0) (err = snd_usb_mixer_status_create(mixer)) < 0)
goto _error; goto _error;