summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Lin <shawn.lin@rock-chips.com>2016-01-22 15:43:12 +0800
committerUlf Hansson <ulf.hansson@linaro.org>2016-02-29 11:03:10 +0100
commit3744415cc4bc732dde6491295ec628a7e3b33754 (patch)
tree227e5167c87820709182594f9292252384d94532
parente8cc37b8fc3a94d17a2689cd77a7744d70477c14 (diff)
downloadop-kernel-dev-3744415cc4bc732dde6491295ec628a7e3b33754.zip
op-kernel-dev-3744415cc4bc732dde6491295ec628a7e3b33754.tar.gz
mmc: dw_mmc: fix err handle of dw_mci_probe
This patch add correct err handle if dw_mci_ctrl_reset failed while probing. Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/host/dw_mmc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 8cb8c1c..341e0f0 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -3063,8 +3063,10 @@ int dw_mci_probe(struct dw_mci *host)
}
/* Reset all blocks */
- if (!dw_mci_ctrl_reset(host, SDMMC_CTRL_ALL_RESET_FLAGS))
- return -ENODEV;
+ if (!dw_mci_ctrl_reset(host, SDMMC_CTRL_ALL_RESET_FLAGS)) {
+ ret = -ENODEV;
+ goto err_clk_ciu;
+ }
host->dma_ops = host->pdata->dma_ops;
dw_mci_init_dma(host);
OpenPOWER on IntegriCloud