]> git.hungrycats.org Git - linux/commitdiff
ASoC: ti: omap-twl4030: Check for missing card name after parsing
authorbui duc phuc <phucduc.bui@gmail.com>
Wed, 5 Aug 2026 04:45:56 +0000 (11:45 +0700)
committerMark Brown <broonie@kernel.org>
Tue, 11 Aug 2026 13:58:08 +0000 (14:58 +0100)
Return any error from snd_soc_of_parse_card_name() directly. If the
helper returns successfully but card->name remains unset, report the
missing card name explicitly before returning -ENODEV.

Suggested-by: Andreas Kemnade <andreas@kemnade.info>
Signed-off-by: bui duc phuc <phucduc.bui@gmail.com>
Link: https://patch.msgid.link/20260805044556.38183-1-phucduc.bui@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/ti/omap-twl4030.c

index 8a3a792a21c6401df3b75937c01820012e33f99c..a3ab52b2b64e2cf2bc0533d6fb140eafad0de9da 100644 (file)
@@ -216,7 +216,11 @@ static int omap_twl4030_probe(struct platform_device *pdev)
        if (priv == NULL)
                return -ENOMEM;
 
-       if (snd_soc_of_parse_card_name(card, "ti,model")) {
+       ret = snd_soc_of_parse_card_name(card, "ti,model");
+       if (ret)
+               return ret;
+
+       if (!card->name) {
                dev_err(&pdev->dev, "Card name is not provided\n");
                return -ENODEV;
        }