diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 21:37:09 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 21:37:09 +0200 |
| commit | c1f9c4227ca2c5bc64abbde3d9d63fd8c06571d7 (patch) | |
| tree | fd013d6f38b25fd1c3890a7f4ad9aa25311e7f54 /sound | |
| parent | 49121304a9831449a841ca0c77dc0ad8697e23c9 (diff) | |
| parent | 778435045a416da71f1757a80e37200a5ea5af70 (diff) | |
| download | linux-stable-c1f9c4227ca2c5bc64abbde3d9d63fd8c06571d7.tar.gz linux-stable-c1f9c4227ca2c5bc64abbde3d9d63fd8c06571d7.tar.bz2 linux-stable-c1f9c4227ca2c5bc64abbde3d9d63fd8c06571d7.zip | |
Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixes
From Andrew Lunn <andrew@lunn.ch>:
* 'v3.5-rc7-fixes' of git://github.com/lunn/linux:
ARM: Kirkwood: Replace mrvl with marvell
ARM: Orion: fix driver probe error handling with respect to clk
ARM: Dove: Fixup ge00 initialisation
ARM: Kirkwood: Fix PHY disable clk problems
ARM: Kirkwood: Ensure runit clock always ticks.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'sound')
| -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); |