summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2016-01-21 17:52:57 +0000
committerMark Brown <broonie@kernel.org>2016-01-29 00:31:46 +0100
commit0f9aa09d669b29ae536d51631bf035ad44ae0551 (patch)
treeaeaa0111e37da4fc61eb065fd082ff393737fa43
parent92e963f50fc74041b5e9e744c330dca48e04f08d (diff)
downloadlinux-stable-0f9aa09d669b29ae536d51631bf035ad44ae0551.tar.gz
linux-stable-0f9aa09d669b29ae536d51631bf035ad44ae0551.tar.bz2
linux-stable-0f9aa09d669b29ae536d51631bf035ad44ae0551.zip
ASoC: wm5110: Fix up snd_soc_register_platform error path
Whilst there is nothing wrong with the error path here it looks a little bit odd, this patches makes the code a little more idiomatic. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/wm5110.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 6088d30962a9..83760b72aa03 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -2366,7 +2366,7 @@ static int wm5110_probe(struct platform_device *pdev)
ret = snd_soc_register_platform(&pdev->dev, &wm5110_compr_platform);
if (ret < 0) {
dev_err(&pdev->dev, "Failed to register platform: %d\n", ret);
- goto error;
+ return ret;
}
ret = snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wm5110,
@@ -2376,7 +2376,6 @@ static int wm5110_probe(struct platform_device *pdev)
snd_soc_unregister_platform(&pdev->dev);
}
-error:
return ret;
}