ARM: Orion: fix driver probe error handling with respect to clk

The clk patches added code to get and enable clocks in the
respective driver probe functions.  If the probe function failed
for some reason after enabling the clock, the clock was not
disabled again in many cases.

Signed-off-by: Simon Baatz <gmbnomis@gmail.com>
Signed-off-by: Andrew Lumm <andrew@lunn.ch>

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);