OSDN Git Service

mmc: sdhci-pxav3: fix error handling of sdhci_add_host
authorXiang Wang <wangx@marvell.com>
Wed, 16 Jul 2014 07:50:09 +0000 (15:50 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 10 Sep 2014 13:54:04 +0000 (15:54 +0200)
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>
drivers/mmc/host/sdhci-pxav3.c

index 46c94d8..5036d7d 100644 (file)
@@ -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: