[PATCH] ASoC: ti: omap-twl4030: Check for missing card name after parsing
| Newsgroups | org.kernel.vger.linux-omap,org.kernel.vger.linux-kernel,org.kernel.vger.linux-sound |
|---|---|
| Message-ID | <[email protected]> |
From: bui duc phuc <[email protected]> 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 <[email protected]> Signed-off-by: bui duc phuc <[email protected]> --- sound/soc/ti/omap-twl4030.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/ti/omap-twl4030.c b/sound/soc/ti/omap-twl4030.c index 8a3a792a21c6..a3ab52b2b64e 100644 --- a/sound/soc/ti/omap-twl4030.c +++ b/sound/soc/ti/omap-twl4030.c @@ -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; } -- 2.43.0