From 75992f8cd94dfe138bd8c8c36ee0a555a49c97ff Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 22 Nov 2012 23:55:10 +0000 Subject: [PATCH] --- yaml --- r: 336324 b: refs/heads/master c: 7430e77e64000133c50cbd287d44733b4f487dc5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci-dove.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index b45cb5372c50..1ebc8029356f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4071fbbb9edbc5a24985b2f64ed45f35b90dbeb +refs/heads/master: 7430e77e64000133c50cbd287d44733b4f487dc5 diff --git a/trunk/drivers/mmc/host/sdhci-dove.c b/trunk/drivers/mmc/host/sdhci-dove.c index 8fd50a211037..4233fd98e3aa 100644 --- a/trunk/drivers/mmc/host/sdhci-dove.c +++ b/trunk/drivers/mmc/host/sdhci-dove.c @@ -92,7 +92,7 @@ static int __devinit sdhci_dove_probe(struct platform_device *pdev) return -ENOMEM; } - priv->clk = clk_get(&pdev->dev, NULL); + priv->clk = devm_clk_get(&pdev->dev, NULL); if (!IS_ERR(priv->clk)) clk_prepare_enable(priv->clk); @@ -107,10 +107,8 @@ static int __devinit sdhci_dove_probe(struct platform_device *pdev) return 0; sdhci_dove_register_fail: - if (!IS_ERR(priv->clk)) { + if (!IS_ERR(priv->clk)) clk_disable_unprepare(priv->clk); - clk_put(priv->clk); - } return ret; } @@ -122,10 +120,9 @@ static int __devexit sdhci_dove_remove(struct platform_device *pdev) sdhci_pltfm_unregister(pdev); - if (!IS_ERR(priv->clk)) { + if (!IS_ERR(priv->clk)) clk_disable_unprepare(priv->clk); - clk_put(priv->clk); - } + return 0; }