The function kirkwood_i2s_dev_remove() may be used when probe fails.
Signed-off-by: Jean-Francois Moine <moin...@free.fr>
---
sound/soc/kirkwood/kirkwood-i2s.c | 40 +++++++++++-----------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c
b/sound/soc/kirkwood/kirkwood-i2s.c
index 0109b1e..319086f 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -449,6 +449,19 @@ static const struct snd_soc_component_driver
kirkwood_i2s_component = {
.name = DRV_NAME,
};
+static int kirkwood_i2s_dev_remove(struct platform_device *pdev)
+{
+ struct kirkwood_dma_data *priv = dev_get_drvdata(&pdev->dev);
+
+ snd_soc_unregister_component(&pdev->dev);
+
+ if (!IS_ERR(priv->extclk))
+ clk_disable_unprepare(priv->extclk);
+ clk_disable_unprepare(priv->clk);
+
+ return 0;
+}
+
static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
{
struct kirkwood_asoc_platform_data *data = pdev->dev.platform_data;
@@ -519,30 +532,17 @@ static int kirkwood_i2s_dev_probe(struct platform_device
*pdev)
err = snd_soc_register_component(&pdev->dev, &kirkwood_i2s_component,
soc_dai, 1);
- if (!err)
- return 0;
- dev_err(&pdev->dev, "snd_soc_register_component failed\n");
-
- if (!IS_ERR(priv->extclk))
- clk_disable_unprepare(priv->extclk);
- clk_disable_unprepare(priv->clk);
+ if (err) {
+ dev_err(&pdev->dev, "snd_soc_register_component failed\n");
+ goto fail;
+ }
+ return 0;
+fail:
+ kirkwood_i2s_dev_remove(pdev);
return err;
}
-static int kirkwood_i2s_dev_remove(struct platform_device *pdev)
-{
- struct kirkwood_dma_data *priv = dev_get_drvdata(&pdev->dev);
-
- snd_soc_unregister_component(&pdev->dev);
-
- if (!IS_ERR(priv->extclk))
- clk_disable_unprepare(priv->extclk);
- clk_disable_unprepare(priv->clk);
-
- return 0;
-}
-
static struct platform_driver kirkwood_i2s_driver = {
.probe = kirkwood_i2s_dev_probe,
.remove = kirkwood_i2s_dev_remove,
--
Ken ar c'hentañ | ** Breizh ha Linux atav! **
Jef | http://moinejf.free.fr/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
