[PATCH] ASoC: fsl: Fix error handling in pcm030_fabric_probe
Miaoqian Lin
linmq006 at gmail.com
Tue Mar 1 08:53:48 CET 2022
This will call twice platform_device_put()
if both platform_device_add() and snd_soc_register_card() fails.
Fix it by using goto label to avoid duplicating the error code logic.
Fixes: fb25621da570 ("ASoC: fsl: Add missing error handling in pcm030_fabric_probe")
Signed-off-by: Miaoqian Lin <linmq006 at gmail.com>
---
sound/soc/fsl/pcm030-audio-fabric.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c
index 83b4a22bf15a..d397bb97f37b 100644
--- a/sound/soc/fsl/pcm030-audio-fabric.c
+++ b/sound/soc/fsl/pcm030-audio-fabric.c
@@ -95,19 +95,23 @@ static int pcm030_fabric_probe(struct platform_device *op)
ret = platform_device_add(pdata->codec_device);
if (ret) {
dev_err(&op->dev, "platform_device_add() failed: %d\n", ret);
- platform_device_put(pdata->codec_device);
+ goto err_add;
}
ret = snd_soc_register_card(card);
if (ret) {
dev_err(&op->dev, "snd_soc_register_card() failed: %d\n", ret);
- platform_device_del(pdata->codec_device);
- platform_device_put(pdata->codec_device);
+ goto err_register;
}
platform_set_drvdata(op, pdata);
return ret;
+err_register:
+ platform_device_del(pdata->codec_device);
+err_add:
+ platform_device_put(pdata->codec_device);
+ return ret;
}
static int pcm030_fabric_remove(struct platform_device *op)
--
2.17.1
More information about the Alsa-devel
mailing list