Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1314804 > unrolled thread

[PATCH] mmc: dw_mmc: fix err handle of dw_mci_probe

Started byShawn Lin <shawn.lin@rock-chips.com>
First post2016-01-22 08:50 +0100
Last post2016-01-25 06:00 +0100
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] mmc: dw_mmc: fix err handle of dw_mci_probe Shawn Lin <shawn.lin@rock-chips.com> - 2016-01-22 08:50 +0100
    Re: [PATCH] mmc: dw_mmc: fix err handle of dw_mci_probe Jaehoon Chung <jh80.chung@samsung.com> - 2016-01-25 06:00 +0100

#1314804 — [PATCH] mmc: dw_mmc: fix err handle of dw_mci_probe

FromShawn Lin <shawn.lin@rock-chips.com>
Date2016-01-22 08:50 +0100
Subject[PATCH] mmc: dw_mmc: fix err handle of dw_mci_probe
Message-ID<qTEDM-Sz-7@gated-at.bofh.it>
This patch add correct err handle if dw_mci_ctrl_reset
failed while probing.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---

 drivers/mmc/host/dw_mmc.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 065a8f5..ec19984 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -3046,8 +3046,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);
-- 
2.3.7

[toc] | [next] | [standalone]


#1316205

FromJaehoon Chung <jh80.chung@samsung.com>
Date2016-01-25 06:00 +0100
Message-ID<qUHpU-754-5@gated-at.bofh.it>
In reply to#1314804
Hi, Shawn.

On 01/22/2016 04:43 PM, Shawn Lin wrote:
> This patch add correct err handle if dw_mci_ctrl_reset
> failed while probing.

Thanks! I will applied this.

Best Regards,
Jaehoon Chung

> 
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
> ---
> 
>  drivers/mmc/host/dw_mmc.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index 065a8f5..ec19984 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -3046,8 +3046,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);
> 

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web