diff options
| author |   Shawn Lin <shawn.lin@rock-chips.com> | 2016-01-22 15:43:12 +0800 |
|---|---|---|
| committer |   Ulf Hansson <ulf.hansson@linaro.org> | 2016-02-29 11:03:10 +0100 |
| commit | 3744415cc4bc732dde6491295ec628a7e3b33754 (patch) | |
| tree | 227e5167c87820709182594f9292252384d94532 /drivers/mmc | |
| parent | mmc: dw_mmc: remove DW_MCI_QUIRK_BROKEN_CARD_DETECTION quirk (diff) | |
| download | linux-dev-3744415cc4bc732dde6491295ec628a7e3b33754.tar.xz linux-dev-3744415cc4bc732dde6491295ec628a7e3b33754.zip | |
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>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/dw_mmc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 8cb8c1c8b3dd..341e0f082f08 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); |