Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3664442pxb; Mon, 24 Jan 2022 14:48:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJwumARepcf3b/II9AKNz8M/qT99FLCqjP2hunveo83nefaPauqb4IUWapJjeKBw3iBf5+Tg X-Received: by 2002:a17:90b:1bc7:: with SMTP id oa7mr408385pjb.149.1643064537332; Mon, 24 Jan 2022 14:48:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643064537; cv=none; d=google.com; s=arc-20160816; b=ezt4ePQtmi51/SSHf2ANk0vhr3K2vQYkdsqlZWgl6D1o3BB1e/Du0NkjoLIMTD/4xu dECwu8W7CJnqJfsrl1z/M/K6EEUp04KGv2QqC75AMdL8DUV4XYqW55/dDp0Et9cadCSz buXWbweZfJOJqF+JHcSXeMAIt0knlm9yUxDBCJWbmzms8T/MgLGk9h4/6FYNY4dyvKvS Ifq7+cglNzXX7joJyTySsaFTNCMBL6ScRH4JltrLdvyghwlXQnumUToXA/lKLre1j4p4 AA1qLLYWj1+Urw51eNCvyerNkEYyGV/dCQuTj99Y2UMrDSQTw138qWCaQZSPvz/DJ/cE qrUQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9i/p/OBRCoH0ResSMHnOHRjOoPD3GqqAzT5X55U0XZ0=; b=yeaqaRW5IYUUxlsI6Bm0ArxOnCEUjddhfV32AdiP40cPoc5NJZ7LM32ADhyOP1A1JR UlO2CU2u9BzQcia/oGQwNE73aIs46iyvleYs3vzRFlMRHT70k+M3qw114KklTJaYMWRo D77e/cnfVsUaiFHTKLGS00bOEvOsM7iEquMce4av7giqgfiLAjIAyuxAAdgmVWUxtzaj rIN5CcnUQzZ9RaobsnABayVYpJnornhM3DEFdRW5ykLMIMsQgiq/rPQNwRHM6JDUknst LaTm5XkV6QeqxOcht9u2sak4SGg2kP1IGa5AOQ2AGEDpUxL34YieWFQPpD0Ib/mOfpdv J0ZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=MYnSIfao; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f4si7512341pgc.600.2022.01.24.14.48.45; Mon, 24 Jan 2022 14:48:57 -0800 (PST) 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=@linuxfoundation.org header.s=korg header.b=MYnSIfao; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1837711AbiAXWpF (ORCPT + 99 others); Mon, 24 Jan 2022 17:45:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1456733AbiAXVjy (ORCPT ); Mon, 24 Jan 2022 16:39:54 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3484C0419CE; Mon, 24 Jan 2022 12:27:03 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 73A80614EC; Mon, 24 Jan 2022 20:27:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3E7C4C340E5; Mon, 24 Jan 2022 20:27:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643056022; bh=spR1xNJx3bFfMAPFkVgQoFMpMInnlTc6YT27FCUaXOQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MYnSIfaockbukrz+5FzqR1719wCU+neKVUQ/OqWfVzgt+3loNr5dpOphPMdiVLotd nlzAPleItYr47BEcv8ATaXc6izEFk7G6NaDjICVMoymQpOdgOxcWiajoFu5QtnlvXH f2xpjk6ujQtV93jlyfeKMao/kozVTNajkcJR4SpQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pavel Hofman , Sasha Levin Subject: [PATCH 5.15 327/846] usb: gadget: u_audio: Subdevice 0 for capture ctls Date: Mon, 24 Jan 2022 19:37:24 +0100 Message-Id: <20220124184112.184479178@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184100.867127425@linuxfoundation.org> References: <20220124184100.867127425@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pavel Hofman [ Upstream commit 601a5bc1aeef772ab1f47582fd322957799f5ab5 ] Both capture and playback alsa devices use subdevice 0. Yet capture-side ctls are defined for subdevice 1. The patch sets subdevice 0 for them. Fixes: 02de698ca812 ("usb: gadget: u_audio: add bi-directional volume and mute support") Signed-off-by: Pavel Hofman Link: https://lore.kernel.org/r/20220105104643.90125-1-pavel.hofman@ivitera.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/gadget/function/u_audio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c index ad16163b5ff80..d22ac23c94b0f 100644 --- a/drivers/usb/gadget/function/u_audio.c +++ b/drivers/usb/gadget/function/u_audio.c @@ -1097,7 +1097,7 @@ int g_audio_setup(struct g_audio *g_audio, const char *pcm_name, } kctl->id.device = pcm->device; - kctl->id.subdevice = i; + kctl->id.subdevice = 0; err = snd_ctl_add(card, kctl); if (err < 0) @@ -1120,7 +1120,7 @@ int g_audio_setup(struct g_audio *g_audio, const char *pcm_name, } kctl->id.device = pcm->device; - kctl->id.subdevice = i; + kctl->id.subdevice = 0; kctl->tlv.c = u_audio_volume_tlv; -- 2.34.1