aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/mixer.h
diff options
context:
space:
mode:
authorGeoffrey D. Bennett <g@b4.vu>2019-07-29 00:42:45 +0930
committerTakashi Iwai <tiwai@suse.de>2019-07-28 17:47:48 +0200
commit9e4d5c1be21f0c00e747e92186784f3298309b3e (patch)
treed8d09dd93b1cdb6ae6353c8ffcc6a8e457b48000 /sound/usb/mixer.h
parentALSA: i2c: ak4xxx-adda: Fix a possible null pointer dereference in build_adc_controls() (diff)
downloadlinux-dev-9e4d5c1be21f0c00e747e92186784f3298309b3e.tar.xz
linux-dev-9e4d5c1be21f0c00e747e92186784f3298309b3e.zip
ALSA: usb-audio: Scarlett Gen 2 mixer interface
Add mixer quirk for the Focusrite Scarlett 6i6, 18i8, and 18i20 Gen 2 audio interfaces. Although the interfaces are USB compliant, additional input/output level controls and hardware routing/mixing functionality are available using proprietary USB requests. Signed-off-by: Geoffrey D. Bennett <g@b4.vu> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/mixer.h')
-rw-r--r--sound/usb/mixer.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h
index 394cd9107507..37e1b234c802 100644
--- a/sound/usb/mixer.h
+++ b/sound/usb/mixer.h
@@ -28,6 +28,10 @@ struct usb_mixer_interface {
struct media_mixer_ctl *media_mixer_ctl;
bool disconnected;
+
+ void *private_data;
+ void (*private_free)(struct usb_mixer_interface *mixer);
+ void (*private_suspend)(struct usb_mixer_interface *mixer);
};
#define MAX_CHANNELS 16 /* max logical channels */