From: Chris J Arges <chris.j.arges@canonical.com> Date: Wed, 17 Dec 2014 22:09:35 +0000 (-0600) Subject: ALSA: usb-audio: Fix Scarlett 6i6 initialization typo X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c99b9e853d3951fe521cc7b2357eec93d5c16246;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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> --- 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" },