summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorChris J Arges <chris.j.arges@canonical.com>2014-12-17 16:09:35 -0600
committerTakashi Iwai <tiwai@suse.de>2014-12-18 08:39:17 +0100
commitc99b9e853d3951fe521cc7b2357eec93d5c16246 (patch)
tree5fc5ffafe66fab707919ff7915fd76e5aa7fa24a /sound
parent7327643ba1586546a082a0f3ffbd2095ccce089e (diff)
downloadlinux-c99b9e853d3951fe521cc7b2357eec93d5c16246.tar.bz2
ALSA: usb-audio: Fix Scarlett 6i6 initialization typo
The num_controls field was incorrectly set to 0 causing 6i6 to not be initialized. Set this to 9. Reported-and-tested-by: Mark Roberts <sunifiram@gmail.com> Signed-off-by: Chris J Arges <chris.j.arges@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/mixer_scarlett.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/mixer_scarlett.c b/sound/usb/mixer_scarlett.c
index 9109652b88b9..7438e7c4a842 100644
--- a/sound/usb/mixer_scarlett.c
+++ b/sound/usb/mixer_scarlett.c
@@ -655,7 +655,7 @@ static struct scarlett_device_info s6i6_info = {
.names = NULL
},
- .num_controls = 0,
+ .num_controls = 9,
.controls = {
{ .num = 0, .type = SCARLETT_OUTPUTS, .name = "Monitor" },
{ .num = 1, .type = SCARLETT_OUTPUTS, .name = "Headphone" },