Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[karo-tx-linux.git] / drivers / mmc / host / sdhci-pxav2.c

diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c
index 347eae2d7b6a7b5d05acee8a66fd85cb14c45735..995083ce1c4654eb9d7d373c2d4b85cba31a09a8 100644 (file)
--- a/drivers/mmc/host/sdhci-pxav2.c
+++ b/drivers/mmc/host/sdhci-pxav2.c
@@ -185,7 +185,11 @@ static int sdhci_pxav2_probe(struct platform_device *pdev)
                goto err_clk_get;
        }
        pltfm_host->clk = clk;
-       clk_prepare_enable(clk);
+       ret = clk_prepare_enable(clk);
+       if (ret) {
+               dev_err(&pdev->dev, "failed to enable io clock\n");
+               goto err_clk_enable;
+       }
 
        host->quirks = SDHCI_QUIRK_BROKEN_ADMA
                | SDHCI_QUIRK_BROKEN_TIMEOUT_VAL
@@ -222,12 +226,11 @@ static int sdhci_pxav2_probe(struct platform_device *pdev)
                goto err_add_host;
        }
 
-       platform_set_drvdata(pdev, host);
-
        return 0;
 
 err_add_host:
        clk_disable_unprepare(clk);
+err_clk_enable:
        clk_put(clk);
 err_clk_get:
        sdhci_pltfm_free(pdev);