Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp1145486pxv; Fri, 9 Jul 2021 19:27:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyN5M2PCaPfy4b3S6TUoOUGhW3VYxpIZigggp0vn8ri7i/UKDkJuvlzWnyE0wFksVWm5RGN X-Received: by 2002:a05:6402:502:: with SMTP id m2mr26080442edv.57.1625884055885; Fri, 09 Jul 2021 19:27:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625884055; cv=none; d=google.com; s=arc-20160816; b=vBZ2eSCN30LSe9A8/8tXpfu1vGoR2BVMczmhfg7p3A4jDJNp54pp78clTrzizvf1iZ DMQT6vaYrYKtKWOv73wceE0oagVocB+f4wkKxmjhLjPKPKrSeSFQOwbApkkkXxkv8FDh fKj9dXaLuEn7L3ExE+NrsLibw9N9U2xByC3h1ZbyoXNk8VTQhajrFMEuKr3u75A5CIgQ 7S0Cx0V3L8gGVq5NhEY18aEZTTd9E2eie++Pl8KVgG4VSP+r1+vwZh81U0IxLP4ASh8k 8gks5P/TgS8h3iR26h2rBvAi7haeQwtMyf9NB5SwL2JwCS5XiYcIUJj2gJfKVc9RvCPA MQGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pOivkSdX6jFkt/jRQhYPmA5JcCZT0OtFxhUSaM+VJhg=; b=V8LgqUDzmL4ah2zCUyrTbymOxOBj6zSlup83ttAewdqTjvKru0BBliOMyq0EO1dTNe aMdp5BFRuosz7ZvTRInWmv2A9TWHwtpzqfDr+5+dloviN6/8S2M+IXZ4Q+RwaEbXsD87 d7+ZOQK66ojoE7kyI0Cg2x4ydGXPV78ujkBr6BZ1fIRvaRvdVVyZzhNBc85el9s9ytAy +em2lfrtfbUM2KBhoUFzz3klya/qrPHGP8rP41tOpysHUHe1rtaA8ejDA2uc8eCx0OkY INnK9YeuNSeWT7Fb7WGwr9cetRrsqUlNkx8fx1AbatuOGcE8SY6iBfwT193/khtRjw9X 2+rA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jEB8NxiP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 16si9650784ejj.242.2021.07.09.19.27.13; Fri, 09 Jul 2021 19:27:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jEB8NxiP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233303AbhGJC2a (ORCPT + 99 others); Fri, 9 Jul 2021 22:28:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:42926 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233459AbhGJC0u (ORCPT ); Fri, 9 Jul 2021 22:26:50 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F1FFC61404; Sat, 10 Jul 2021 02:23:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625883839; bh=LxCwRtxaKji1/yWWC225oB97o2nP1W9knzaC4LCyCzA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jEB8NxiPL8/bmuQROB22O6634L5slEeJbCuXopZq/9DJZxZin+9LLzoCEqpOMopFl pSHgsClv2JWrFM0YTtx55NV9l/cOQJBT/v8RLJSfI3xt5xXOQtjmhmIC/Ad5xvb1ZY RhBJX+3fCxcqWJTecQJSd7lSB0dYm9QUfd/oM4hsehLlKjbniprwb3Gmt3rLIpgjjC 2Peb5sDSzzPx07dPRPCykdKYA376FQLVpWw0t46K9E4yR2a/FoDqu86Lb35T2/1Hcm ItFDqGbf2jp2B2lG/2Xk7ZTnursHJ5RVxe/UFRYnPZ+4hScfVyKbsN14Js7gomKZZb yfP/h0itkh45A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Geoffrey D. Bennett" , Takashi Iwai , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.12 085/104] ALSA: usb-audio: scarlett2: Fix 18i8 Gen 2 PCM Input count Date: Fri, 9 Jul 2021 22:21:37 -0400 Message-Id: <20210710022156.3168825-85-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210710022156.3168825-1-sashal@kernel.org> References: <20210710022156.3168825-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Geoffrey D. Bennett" [ Upstream commit c5210f213456383482b4a77c5310282a89a106b5 ] The 18i8 Gen 2 has 8 PCM Inputs, not 20. Fix the ports entry in s18i8_gen2_info. Signed-off-by: Geoffrey D. Bennett Link: https://lore.kernel.org/r/20210620164625.GA9165@m.b4.vu Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/usb/mixer_scarlett_gen2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c index 4caf379d5b99..b2fa317ba2ab 100644 --- a/sound/usb/mixer_scarlett_gen2.c +++ b/sound/usb/mixer_scarlett_gen2.c @@ -356,7 +356,7 @@ static const struct scarlett2_device_info s18i8_gen2_info = { }, [SCARLETT2_PORT_TYPE_PCM] = { .id = 0x600, - .num = { 20, 18, 18, 14, 10 }, + .num = { 8, 18, 18, 14, 10 }, .src_descr = "PCM %d", .src_num_offset = 1, .dst_descr = "PCM %02d Capture" -- 2.30.2