Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752323AbaLRICa (ORCPT ); Thu, 18 Dec 2014 03:02:30 -0500 Received: from cantor2.suse.de ([195.135.220.15]:33919 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752241AbaLRIC2 (ORCPT ); Thu, 18 Dec 2014 03:02:28 -0500 Date: Thu, 18 Dec 2014 09:02:26 +0100 Message-ID: From: Takashi Iwai To: Chris J Arges Cc: alsa-devel@vger.kernel.org, Jaroslav Kysela , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ALSA: usb-audio: Fix Scarlett 6i6 initialization typo In-Reply-To: <1418854194-13837-1-git-send-email-chris.j.arges@canonical.com> References: <1418854194-13837-1-git-send-email-chris.j.arges@canonical.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.4 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Wed, 17 Dec 2014 16:09:35 -0600, Chris J Arges wrote: > > 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 > Signed-off-by: Chris J Arges Applied, thanks. Takashi > --- > sound/usb/mixer_scarlett.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/usb/mixer_scarlett.c b/sound/usb/mixer_scarlett.c > index 9109652..7438e7c 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" }, > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/