diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2011-04-08 02:09:02 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-11 16:14:09 -0400 |
commit | 0b5ec87d3e1bcfe56515e550e1c6c94db9ab928b (patch) | |
tree | fdcd8ddcaee83310e7903364013305f96aa1deea /sound | |
parent | b9cbfcbe260c43bac3a6d941b095cc4dcf70e614 (diff) |
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.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 0c9997e2d8c0..8e51a6eafbc3 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) | |||
1218 | goto exit_free_irq; | 1218 | goto exit_free_irq; |
1219 | } | 1219 | } |
1220 | 1220 | ||
1221 | return snd_soc_register_dais(&pdev->dev, fsi_soc_dai, ARRAY_SIZE(fsi_soc_dai)); | 1221 | ret = snd_soc_register_dais(&pdev->dev, fsi_soc_dai, |
1222 | ARRAY_SIZE(fsi_soc_dai)); | ||
1223 | if (ret < 0) { | ||
1224 | dev_err(&pdev->dev, "cannot snd dai register\n"); | ||
1225 | goto exit_snd_soc; | ||
1226 | } | ||
1222 | 1227 | ||
1228 | return ret; | ||
1229 | |||
1230 | exit_snd_soc: | ||
1231 | snd_soc_unregister_platform(&pdev->dev); | ||
1223 | exit_free_irq: | 1232 | exit_free_irq: |
1224 | free_irq(irq, master); | 1233 | free_irq(irq, master); |
1225 | exit_iounmap: | 1234 | exit_iounmap: |