Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp1148490pxv; Fri, 9 Jul 2021 19:33:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzN6fJ34er5P0JC94JA0O1Xwn8ZZr/FbB5FdqKh2LhbjknCLCIyOgJWgeOdu3aBQCbgr+gg X-Received: by 2002:a05:6402:48f:: with SMTP id k15mr50137096edv.262.1625884422251; Fri, 09 Jul 2021 19:33:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625884422; cv=none; d=google.com; s=arc-20160816; b=s3MRVp0r1XLIlYIuUsExyocEXvK+3WNSnraFPXRXx2Fn8Cc8e2eOBybyoRP4yFdjBh 5wYL8JoOqhiVUgQ90EOoaQQrECz0ac0day3BxXrYIfNN91SYBE+uUEV175jvlfCcNaDf 32FY95qisR3d3bOsablMc6GagFFx/PNCWeDx/0irEMWerUoY0/q/vqUei953S4cuu6t9 pMoCcvZcTjD2m4KZKDKCsxMaFnAyooZ02VqaPF26DAtT6q2qmBXqWKiWS0XEN6RBkl6G n1aAb5gD+Q3pLuEVoQ62FTgFqmH3xyhPPERTyb33LWY7I3EHSAyxLKM0KKJOwR3yvLr2 Eb2w== 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=MX8chjvIXme6M8544YdcOoOVh5xn03U2ybxNKI1+ZoA=; b=soU9+64DFr0uc1+6rCAM7SjYs5L3epp5aERV+jN17cgcsI9dc4aDTJuwQThs9AkP7h C3jinnuPMA57OzSP1iLbDGF06Fuv1qRz86dqJoq85dxRhNr6TT9fNfcdwuqld3KnGbyZ dkuScwgjnzPrhpnSj2J/r9z2SuIdLzw4Ct3VBuBDq7DqK9PbRKNdRufObrv6JHUZVOZc rqiVV8VMdPkNDDw6uJvlekVH2veWAkdUSyEk0zkS0jl1Ga3AnoO1x2AGmatYqEyOK/lG tBStqFxgpP1E2ziuPa7WGSuxj7p2iEcRcRv0cjoX4UKAfYPJpOs8CF6LnlpMeHnFb73h yDvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dZOCvpqA; 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 jz26si8972523ejc.709.2021.07.09.19.33.19; Fri, 09 Jul 2021 19:33:42 -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=dZOCvpqA; 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 S233845AbhGJCeH (ORCPT + 99 others); Fri, 9 Jul 2021 22:34:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:42704 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234530AbhGJC3f (ORCPT ); Fri, 9 Jul 2021 22:29:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 171DA613CC; Sat, 10 Jul 2021 02:26:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625884000; bh=JbCjgc8ev0nZxAc//eKoDLMYRNLvBgKM6lXAiMftk6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dZOCvpqAuSDe2S2bqt0gP3rTypJoqvFc/y2NWY903Zf9Zwa9K9OXCEyM9Kl/QdY7U VOybHB3jCWHEIMvID/dgW+IHv+8VLAYcDePt1f6t53YKNyPimBu4iQYuQgHiejIg+W v/1YjKRGIqr2zvP7XtF9c7lgtV81w55PSS7a1R7v1YV++VdpZJRLhvY5qjc6p9OJdI cmUeQeK91auL0S+l6vsmB6qyLUqPc1ImIXYsynsFUyhdvSbeXrGO0yolQSbe6OAzgv IuZqOMpbUkSv+MlUFYmLr0iO7SgQLtUOwobAUqY91rg5Ngc5V8LGMK7rodxxNRXN+I 8el5OGIQbC0yA== 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.10 75/93] ALSA: usb-audio: scarlett2: Fix 18i8 Gen 2 PCM Input count Date: Fri, 9 Jul 2021 22:24:09 -0400 Message-Id: <20210710022428.3169839-75-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210710022428.3169839-1-sashal@kernel.org> References: <20210710022428.3169839-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 9a98b0c048e3..e605ec5a91ba 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