Commit 7b6717e1 authored by Daniel Mack's avatar Daniel Mack Committed by Takashi Iwai

ALSA: usb-audio: Assume first control interface is for audio

For devices with more than one control interface, let's assume the first
one contains the audio controls. Unfortunately, there is no field in any
of the descriptors to tell us whether a control interface is for audio
or MIDI controls, so a better check is not easy to implement.

On a composite device with audio and MIDI functions, for example, the
code currently overwrites chip->ctrl_intf, causing operations on the
control interface to fail if they are issued after the device probe.
Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2bfc96a1
...@@ -465,7 +465,13 @@ static void *snd_usb_audio_probe(struct usb_device *dev, ...@@ -465,7 +465,13 @@ static void *snd_usb_audio_probe(struct usb_device *dev,
goto __error; goto __error;
} }
chip->ctrl_intf = alts; /*
* For devices with more than one control interface, we assume the
* first contains the audio controls. We might need a more specific
* check here in the future.
*/
if (!chip->ctrl_intf)
chip->ctrl_intf = alts;
if (err > 0) { if (err > 0) {
/* create normal USB audio interfaces */ /* create normal USB audio interfaces */
......
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