Commit 4af1ded4 authored by Xiang Wang's avatar Xiang Wang Committed by Luis Henriques

mmc: sdhci-pxav3: fix error handling of sdhci_add_host

commit 87d2163d upstream.

Commit 0dcaa249 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: default avatarXiang Wang <wangx@marvell.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
[ luis: 3.16-stable prereq for:
  aa8165f9 "mmc: sdhci-pxav3: do the mbus window configuration after enabling clocks" ]
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 2b78e4b7
......@@ -382,11 +382,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);
clk_put(clk);
err_clk_get:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment