From 601a5bc1aeef772ab1f47582fd322957799f5ab5 Mon Sep 17 00:00:00 2001

From: Pavel Hofman <pavel.hofman@ivitera.com>

Date: Wed, 5 Jan 2022 11:46:43 +0100

Subject: [PATCH] usb: gadget: u_audio: Subdevice 0 for capture ctls

Git-commit: 601a5bc1aeef772ab1f47582fd322957799f5ab5

Patch-mainline: v5.17-rc1

References: git-fixes

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 <pavel.hofman@ivitera.com>

Link: https://lore.kernel.org/r/20220105104643.90125-1-pavel.hofman@ivitera.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 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 4fb05f9576a6..4561d7a183ff 100644

--- a/drivers/usb/gadget/function/u_audio.c

+++ b/drivers/usb/gadget/function/u_audio.c

@@ -1147,7 +1147,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)

@@ -1170,7 +1170,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.31.1