[PATCH v2 2/2] ASoC: SDCA: fix finding wrong entity

[PATCH v2 2/2] ASoC: SDCA: fix finding wrong entity

[shumingf]

From: Shuming Fan <shumingf@realtek.com>

This patch fixes an issue like:
where searching for the entity 'FU 11' could incorrectly match 'FU 113' first.
The driver should first perform an exact match on the full string name.
If no exact match is found, it can then fall back to a partial match.

Fixes: 48fa77af2f4a ("ASoC: SDCA: Add terminal type into input/output widget name")
Signed-off-by: Shuming Fan <shumingf@realtek.com>
---
 sound/soc/sdca/sdca_functions.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/sound/soc/sdca/sdca_functions.c b/sound/soc/sdca/sdca_functions.c
index 0b7d97dcb236..fd6a254c9530 100644
--- a/sound/soc/sdca/sdca_functions.c
+++ b/sound/soc/sdca/sdca_functions.c
@@ -1601,10 +1601,19 @@ static int find_sdca_entities(struct device *dev, struct sdw_slave *sdw,
 static struct sdca_entity *find_sdca_entity_by_label(struct sdca_function_data *function,
 						     const char *entity_label)
 {
+	struct sdca_entity *entity = NULL;
 	int i;
 
 	for (i = 0; i < function->num_entities; i++) {
-		struct sdca_entity *entity = &function->entities[i];
+		entity = &function->entities[i];
+
+		/* check whole string first*/
+		if (!strcmp(entity->label, entity_label))
+			return entity;
+	}
+
+	for (i = 0; i < function->num_entities; i++) {
+		entity = &function->entities[i];
 
 		if (!strncmp(entity->label, entity_label, strlen(entity_label)))
 			return entity;
-- 
2.53.0

Re: [PATCH v2 2/2] ASoC: SDCA: fix finding wrong entity

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 762 bytes --]

On Wed, Mar 25, 2026 at 07:04:06PM +0800, shumingf@realtek.com wrote:
> From: Shuming Fan <shumingf@realtek.com>
> 
> This patch fixes an issue like:
> where searching for the entity 'FU 11' could incorrectly match 'FU 113' first.
> The driver should first perform an exact match on the full string name.
> If no exact match is found, it can then fall back to a partial match.

Please don't send individual patches with series numbering that are not
part of a series, the numbering only makes sense within a series to
order things.  Individual patches shouldn't be numbered, and the numbers
should reflect that series itself.

Your threading is also broken on the seriese that you do send, they just
appear as separate sends without any threaded.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH v2 2/2] ASoC: SDCA: fix finding wrong entity

[Charles Keepax]

On Wed, Mar 25, 2026 at 07:04:06PM +0800, shumingf@realtek.com wrote:
> From: Shuming Fan <shumingf@realtek.com>
> 
> This patch fixes an issue like:
> where searching for the entity 'FU 11' could incorrectly match 'FU 113' first.
> The driver should first perform an exact match on the full string name.
> If no exact match is found, it can then fall back to a partial match.
> 
> Fixes: 48fa77af2f4a ("ASoC: SDCA: Add terminal type into input/output widget name")
> Signed-off-by: Shuming Fan <shumingf@realtek.com>
> ---

Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles