diff options
| author | Xiang Wang | 2014-07-16 09:50:09 +0200 |
|---|---|---|
| committer | Ulf Hansson | 2014-09-10 15:54:04 +0200 |
| commit | 87d2163dae1f2388c7ccda5269be8d58e24382dd (patch) | |
| tree | 98e667049ab3c67130a21966d1e340953cebb76f /drivers/mmc/host/sdhci-pxav3.c | |
| parent | mmc: mmci: rename sdio flag in vendor data to st_sdio (diff) | |
| download | kernel-qcow2-linux-87d2163dae1f2388c7ccda5269be8d58e24382dd.tar.gz kernel-qcow2-linux-87d2163dae1f2388c7ccda5269be8d58e24382dd.tar.xz kernel-qcow2-linux-87d2163dae1f2388c7ccda5269be8d58e24382dd.zip | |
mmc: sdhci-pxav3: fix error handling of sdhci_add_host
Commit 0dcaa2499b7d111bd70da5b0976c34210c850fb3 improved error
handling of sdhci_add_host. However, "err_of_parse" and "err_cd_req"
should be placed after "pm_runtime_disable(&pdev->dev)".
Signed-off-by: Xiang Wang <wangx@marvell.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/sdhci-pxav3.c')
| -rw-r--r-- | drivers/mmc/host/sdhci-pxav3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index 46c94d88fa93..5036d7d39529 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -380,11 +380,11 @@ static int sdhci_pxav3_probe(struct platform_device *pdev) return 0; -err_of_parse: -err_cd_req: err_add_host: pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); +err_of_parse: +err_cd_req: clk_disable_unprepare(clk); err_clk_get: err_mbus_win: |