Skip to content

Commit b0ff70e

Browse files
1Naimbroonie
authored andcommitted
ASoC: cs35l41: Always return 0 when a subsystem ID is found
When trying to get the system name in the _HID path, after successfully retrieving the subsystem ID the return value isn't set to 0 but instead still kept at -ENODATA, leading to a false negative: [ 12.382507] cs35l41 spi-VLV1776:00: Subsystem ID: VLV1776 [ 12.382521] cs35l41 spi-VLV1776:00: probe with driver cs35l41 failed with error -61 Always return 0 when a subsystem ID is found to mitigate these false negatives. Link: CachyOS/CachyOS-Handheld#83 Fixes: 46c8b4d ("ASoC: cs35l41: Fallback to reading Subsystem ID property if not ACPI") Cc: stable@vger.kernel.org # 6.18 Signed-off-by: Eric Naim <dnaim@cachyos.org> Reviewed-by: Richard Fitzgerald <rf@opensource.cirrus.com> Link: https://patch.msgid.link/20251206193813.56955-1-dnaim@cachyos.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 8fb8173 commit b0ff70e

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

sound/soc/codecs/cs35l41.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,13 +1188,14 @@ static int cs35l41_get_system_name(struct cs35l41_private *cs35l41)
11881188
}
11891189
}
11901190

1191-
err:
11921191
if (sub) {
11931192
cs35l41->dsp.system_name = sub;
11941193
dev_info(cs35l41->dev, "Subsystem ID: %s\n", cs35l41->dsp.system_name);
1195-
} else
1196-
dev_warn(cs35l41->dev, "Subsystem ID not found\n");
1194+
return 0;
1195+
}
11971196

1197+
err:
1198+
dev_warn(cs35l41->dev, "Subsystem ID not found\n");
11981199
return ret;
11991200
}
12001201

0 commit comments

Comments
 (0)