diff options
author | Xiang Wang <wangx@marvell.com> | 2014-07-16 03:50:09 -0400 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-09-10 09:54:04 -0400 |
commit | 87d2163dae1f2388c7ccda5269be8d58e24382dd (patch) | |
tree | 98e667049ab3c67130a21966d1e340953cebb76f /drivers | |
parent | c73541336389f9fd72f592601c40a2e70320cf31 (diff) |
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')
-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) | |||
380 | 380 | ||
381 | return 0; | 381 | return 0; |
382 | 382 | ||
383 | err_of_parse: | ||
384 | err_cd_req: | ||
385 | err_add_host: | 383 | err_add_host: |
386 | pm_runtime_put_sync(&pdev->dev); | 384 | pm_runtime_put_sync(&pdev->dev); |
387 | pm_runtime_disable(&pdev->dev); | 385 | pm_runtime_disable(&pdev->dev); |
386 | err_of_parse: | ||
387 | err_cd_req: | ||
388 | clk_disable_unprepare(clk); | 388 | clk_disable_unprepare(clk); |
389 | err_clk_get: | 389 | err_clk_get: |
390 | err_mbus_win: | 390 | err_mbus_win: |