summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2011-04-08 15:09:02 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-11 13:14:09 -0700
commit0b5ec87d3e1bcfe56515e550e1c6c94db9ab928b (patch)
treefdcd8ddcaee83310e7903364013305f96aa1deea /sound
parentb9cbfcbe260c43bac3a6d941b095cc4dcf70e614 (diff)
downloadlinux-3.10-0b5ec87d3e1bcfe56515e550e1c6c94db9ab928b.tar.gz
linux-3.10-0b5ec87d3e1bcfe56515e550e1c6c94db9ab928b.tar.bz2
linux-3.10-0b5ec87d3e1bcfe56515e550e1c6c94db9ab928b.zip
ASoC: fsi: take care in failing case of dai register
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/sh/fsi.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 0c9997e2d8c..8e51a6eafbc 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -1218,8 +1218,17 @@ static int fsi_probe(struct platform_device *pdev)
goto exit_free_irq;
}
- return snd_soc_register_dais(&pdev->dev, fsi_soc_dai, ARRAY_SIZE(fsi_soc_dai));
+ ret = snd_soc_register_dais(&pdev->dev, fsi_soc_dai,
+ ARRAY_SIZE(fsi_soc_dai));
+ if (ret < 0) {
+ dev_err(&pdev->dev, "cannot snd dai register\n");
+ goto exit_snd_soc;
+ }
+ return ret;
+
+exit_snd_soc:
+ snd_soc_unregister_platform(&pdev->dev);
exit_free_irq:
free_irq(irq, master);
exit_iounmap: