aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/spear/spdif_in.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2013-06-12 16:18:01 -0400
committerMark Brown <broonie@linaro.org>2013-06-13 05:25:52 -0400
commitd8f4e17fdd4f5e6fe6ef07496296fa88e150beda (patch)
treed4c97d192e8961d66d94722ddb4f14e8d45e760e /sound/soc/spear/spdif_in.c
parente58070ee4fdf797c47cb296992ce8db3df715eca (diff)
ASoC: SPEAr spdif_{in,out}: fix fallout of previous cleanup
The patch that resulted in bfcc74e (ASoC: SPEAr spdif_{in,out}: use devm for clk and a few more cleanups) was broken and applied on a newer tree than it was created for. So bfcc74e introduced unbalanced clk handling, two warnings about unused variables and passed 3 arguments to a function only taking 2. This commit fixes that. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/spear/spdif_in.c')
-rw-r--r--sound/soc/spear/spdif_in.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/sound/soc/spear/spdif_in.c b/sound/soc/spear/spdif_in.c
index f0071ddbfa7d..63acfeb4b69d 100644
--- a/sound/soc/spear/spdif_in.c
+++ b/sound/soc/spear/spdif_in.c
@@ -257,20 +257,12 @@ static int spdif_in_probe(struct platform_device *pdev)
257 return ret; 257 return ret;
258 } 258 }
259 259
260 ret = snd_soc_register_component(&pdev->dev, &spdif_in_component, 260 return snd_soc_register_component(&pdev->dev, &spdif_in_component,
261 &spdif_in_dai, 1); 261 &spdif_in_dai, 1);
262 if (ret != 0) {
263 clk_put(host->clk);
264 return ret;
265 }
266
267 return 0;
268} 262}
269 263
270static int spdif_in_remove(struct platform_device *pdev) 264static int spdif_in_remove(struct platform_device *pdev)
271{ 265{
272 struct spdif_in_dev *host = dev_get_drvdata(&pdev->dev);
273
274 snd_soc_unregister_component(&pdev->dev); 266 snd_soc_unregister_component(&pdev->dev);
275 267
276 return 0; 268 return 0;