summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Sanjuan2018-06-14 16:05:58 +0200
committerTakashi Iwai2018-06-14 18:04:05 +0200
commitad6baae6238136d9380ba95aa1646ab8b2fa52f5 (patch)
tree6cdea188356fd44139e109bb46d601e68d9d4cd3
parentALSA: usb-audio: Add insertion control for UAC3 BADD (diff)
downloadkernel-qcow2-linux-ad6baae6238136d9380ba95aa1646ab8b2fa52f5.tar.gz
kernel-qcow2-linux-ad6baae6238136d9380ba95aa1646ab8b2fa52f5.tar.xz
kernel-qcow2-linux-ad6baae6238136d9380ba95aa1646ab8b2fa52f5.zip
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,
err = snd_usb_mixer_controls(mixer);
if (err < 0)
goto _error;
- err = snd_usb_mixer_status_create(mixer);
- if (err < 0)
- goto _error;
}
+
+ err = snd_usb_mixer_status_create(mixer);
+ if (err < 0)
+ goto _error;
+
err = create_keep_iface_ctl(mixer);
if (err < 0)
goto _error;