aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Sanjuan <jorge.sanjuan@codethink.co.uk>2018-06-14 10:05:58 -0400
committerTakashi Iwai <tiwai@suse.de>2018-06-14 12:04:05 -0400
commitad6baae6238136d9380ba95aa1646ab8b2fa52f5 (patch)
tree6cdea188356fd44139e109bb46d601e68d9d4cd3
parent3528cd8f6a902c0c8597cc97f91371f0bc16ab7b (diff)
ALSA: usb-audio: Always create the interrupt pipe for the mixer
An UAC3 BADD device may also include an interrupt status pipe to report changes on the HEADSET ADAPTER terminals. The creation of the status pipe is dependent on the device reporting that it has it. Signed-off-by: Jorge Sanjuan <jorge.sanjuan@codethink.co.uk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/usb/mixer.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 03b8a2ac93c8..b1dcf6dfc27e 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -3338,10 +3338,12 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif,
3338 err = snd_usb_mixer_controls(mixer); 3338 err = snd_usb_mixer_controls(mixer);
3339 if (err < 0) 3339 if (err < 0)
3340 goto _error; 3340 goto _error;
3341 err = snd_usb_mixer_status_create(mixer);
3342 if (err < 0)
3343 goto _error;
3344 } 3341 }
3342
3343 err = snd_usb_mixer_status_create(mixer);
3344 if (err < 0)
3345 goto _error;
3346
3345 err = create_keep_iface_ctl(mixer); 3347 err = create_keep_iface_ctl(mixer);
3346 if (err < 0) 3348 if (err < 0)
3347 goto _error; 3349 goto _error;