diff options
| author | Geoffrey D. Bennett <g@b4.vu> | 2019-07-29 00:42:45 +0930 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-07-28 17:47:48 +0200 |
| commit | 9e4d5c1be21f0c00e747e92186784f3298309b3e (patch) | |
| tree | d8d09dd93b1cdb6ae6353c8ffcc6a8e457b48000 /sound/usb/mixer.c | |
| parent | 2127c01b7f63b06a21559f56a8c81a3c6535bd1a (diff) | |
| download | linux-9e4d5c1be21f0c00e747e92186784f3298309b3e.tar.bz2 | |
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.c')
| -rw-r--r-- | sound/usb/mixer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 7498b5191b68..7b51ab4c35b0 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -3509,6 +3509,8 @@ void snd_usb_mixer_disconnect(struct usb_mixer_interface *mixer) usb_kill_urb(mixer->urb); if (mixer->rc_urb) usb_kill_urb(mixer->rc_urb); + if (mixer->private_free) + mixer->private_free(mixer); mixer->disconnected = true; } @@ -3536,6 +3538,8 @@ static int snd_usb_mixer_activate(struct usb_mixer_interface *mixer) int snd_usb_mixer_suspend(struct usb_mixer_interface *mixer) { snd_usb_mixer_inactivate(mixer); + if (mixer->private_suspend) + mixer->private_suspend(mixer); return 0; } |