From patchwork Wed Dec 17 22:09:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris J Arges X-Patchwork-Id: 5509441 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1C280BEEA8 for ; Wed, 17 Dec 2014 22:10:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 463BB20A16 for ; Wed, 17 Dec 2014 22:10:32 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id D6C7C209DE for ; Wed, 17 Dec 2014 22:10:30 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 174C62614BB; Wed, 17 Dec 2014 23:10:28 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id A187B2612D6; Wed, 17 Dec 2014 23:10:18 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 0DF4D2612D7; Wed, 17 Dec 2014 23:10:17 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by alsa0.perex.cz (Postfix) with ESMTP id CB4302612CC for ; Wed, 17 Dec 2014 23:10:08 +0100 (CET) Received: from [10.172.65.250] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1Y1MnF-0001BP-Ea; Wed, 17 Dec 2014 22:10:05 +0000 From: Chris J Arges To: alsa-devel@vger.kernel.org Date: Wed, 17 Dec 2014 16:09:35 -0600 Message-Id: <1418854194-13837-1-git-send-email-chris.j.arges@canonical.com> X-Mailer: git-send-email 1.9.1 Cc: Takashi Iwai , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Chris J Arges Subject: [alsa-devel] [PATCH] ALSA: usb-audio: Fix Scarlett 6i6 initialization typo X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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" },