diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 16:45:25 +0200 |
|---|---|---|
| committer | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 16:45:25 +0200 |
| commit | 89fb2d77d5daa821e3868ea59963f28249974840 (patch) | |
| tree | 6cc80209a208133000c203cf9a9f61dd42fd53a9 /sound/soc/kirkwood | |
| parent | Merge tag 'spi-3.6' into v3.5-rc7-dt-v3 (diff) | |
| parent | ARM: Kirkwood: Replace mrvl with marvell (diff) | |
| download | linux-89fb2d77d5daa821e3868ea59963f28249974840.tar.xz linux-89fb2d77d5daa821e3868ea59963f28249974840.zip | |
Merge branch 'v3.5-rc7-fixes' into v3.5-rc7-dt-v3
Merge in branch already pulled. Fulfils dependancies needed by
this patchset.
Diffstat (limited to 'sound/soc/kirkwood')
| -rw-r--r-- | sound/soc/kirkwood/kirkwood-i2s.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index fa4556750451..7646dd7f30cb 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -458,7 +458,13 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev) } clk_prepare_enable(priv->clk); - return snd_soc_register_dai(&pdev->dev, &kirkwood_i2s_dai); + err = snd_soc_register_dai(&pdev->dev, &kirkwood_i2s_dai); + if (!err) + return 0; + dev_err(&pdev->dev, "snd_soc_register_dai failed\n"); + + clk_disable_unprepare(priv->clk); + clk_put(priv->clk); err_ioremap: iounmap(priv->io); |