Commit 320244ac authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Greg Kroah-Hartman

ASoC: sun4i-codec: return error code instead of NULL when create_card fails

commit 85915b63 upstream.

When sun4i_codec_create_card fails, we do not assign a proper error
code to the return value. The return value would be 0 from the previous
function call, or we would have bailed out sooner. This would confuse
the driver core into thinking the device probe succeeded, when in fact
it didn't, leaving various devres based resources lingering.

Make the create_card function pass back a meaningful error code, and
assign it to the return value.

Fixes: 45fb6b6f ("ASoC: sunxi: add support for the on-chip codec on
		      early Allwinner SoCs")
Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2140d4fd
...@@ -738,11 +738,11 @@ static struct snd_soc_card *sun4i_codec_create_card(struct device *dev) ...@@ -738,11 +738,11 @@ static struct snd_soc_card *sun4i_codec_create_card(struct device *dev)
card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL); card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
if (!card) if (!card)
return NULL; return ERR_PTR(-ENOMEM);
card->dai_link = sun4i_codec_create_link(dev, &card->num_links); card->dai_link = sun4i_codec_create_link(dev, &card->num_links);
if (!card->dai_link) if (!card->dai_link)
return NULL; return ERR_PTR(-ENOMEM);
card->dev = dev; card->dev = dev;
card->name = "sun4i-codec"; card->name = "sun4i-codec";
...@@ -842,7 +842,8 @@ static int sun4i_codec_probe(struct platform_device *pdev) ...@@ -842,7 +842,8 @@ static int sun4i_codec_probe(struct platform_device *pdev)
} }
card = sun4i_codec_create_card(&pdev->dev); card = sun4i_codec_create_card(&pdev->dev);
if (!card) { if (IS_ERR(card)) {
ret = PTR_ERR(card);
dev_err(&pdev->dev, "Failed to create our card\n"); dev_err(&pdev->dev, "Failed to create our card\n");
goto err_unregister_codec; goto err_unregister_codec;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment