linux-kernel - [PATCH v1] ASoC: qcom: qdsp6: Fix references to lookup USB

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250411192653.1443521-1-quic_wcheng@quicinc.com>
Date: Fri, 11 Apr 2025 12:26:53 -0700
From: Wesley Cheng <quic_wcheng@...cinc.com>
To: <srinivas.kandagatla@...aro.org>, <tiwai@...e.com>, <perex@...ex.cz>,
        <lgirdwood@...il.com>, <broonie@...nel.org>
CC: <linux-arm-msm@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
        <stephan.gerhold@...aro.org>, <linux-sound@...r.kernel.org>,
        Wesley Cheng
	<quic_wcheng@...cinc.com>
Subject: [PATCH v1] ASoC: qcom: qdsp6: Fix references to lookup USB_RX mixer status

This addresses a change in the USB RX mixer naming that was updated in the
following commit:

commit 450d63471d1c ("ASoC: qcom: qdsp6: Introduce USB AFE port to q6dsp")

In order for the USB SND offload mixer to reference the correct PCM device
index, the q6usb_usb_mixer_enabled() is used to match the mixer associated
to the FE multimedia DAI, so the naming has to match.  Update the string
lookup and comments with the proper "USB_RX Audio Mixer" tag.

Fixes: e0dd9240f13a ("ASoC: qcom: qdsp6: Fetch USB offload mapped card and PCM device")
Signed-off-by: Wesley Cheng <quic_wcheng@...cinc.com>
---
 sound/soc/qcom/qdsp6/q6usb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/qcom/qdsp6/q6usb.c b/sound/soc/qcom/qdsp6/q6usb.c
index 274c251e84dd..abc0d62950b3 100644
--- a/sound/soc/qcom/qdsp6/q6usb.c
+++ b/sound/soc/qcom/qdsp6/q6usb.c
@@ -158,7 +158,7 @@ static int q6usb_usb_mixer_enabled(struct snd_soc_dapm_widget *w)
 
 	/* Checks to ensure USB path is enabled/connected */
 	snd_soc_dapm_widget_for_each_sink_path(w, p)
-		if (!strcmp(p->sink->name, "USB Mixer") && p->connect)
+		if (!strcmp(p->sink->name, "USB_RX Audio Mixer") && p->connect)
 			return 1;
 
 	return 0;
@@ -173,7 +173,7 @@ static int q6usb_get_pcm_id(struct snd_soc_component *component)
 	/*
 	 * Traverse widgets to find corresponding FE widget.  The DAI links are
 	 * built like the following:
-	 *    MultiMedia* <-> MM_DL* <-> USB Mixer*
+	 *    MultiMedia* <-> MM_DL* <-> USB_RX Audio Mixer*
 	 */
 	for_each_card_widgets(component->card, w) {
 		if (!strncmp(w->name, "MultiMedia", 10)) {