linux-mmc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH RESEND] mmc: sdhci-s3c: fix wrong error-control
@ 2011-10-12  4:14 Jaehoon Chung
  2011-10-12 15:19 ` Chris Ball
  0 siblings, 1 reply; 2+ messages in thread
From: Jaehoon Chung @ 2011-10-12  4:14 UTC (permalink / raw)
  To: linux-mmc; +Cc: Chris Ball, Kyungmin Park

If sc->clk_bus[ptr] is NULL, happen NULL pointer error.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
 drivers/mmc/host/sdhci-s3c.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index 82709b6..3d00e72 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -567,8 +567,10 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
 
  err_req_regs:
 	for (ptr = 0; ptr < MAX_BUS_CLK; ptr++) {
-		clk_disable(sc->clk_bus[ptr]);
-		clk_put(sc->clk_bus[ptr]);
+		if (sc->clk_bus[ptr]) {
+			clk_disable(sc->clk_bus[ptr]);
+			clk_put(sc->clk_bus[ptr]);
+		}
 	}
 
  err_no_busclks:
-- 
1.7.4.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH RESEND] mmc: sdhci-s3c: fix wrong error-control
  2011-10-12  4:14 [PATCH RESEND] mmc: sdhci-s3c: fix wrong error-control Jaehoon Chung
@ 2011-10-12 15:19 ` Chris Ball
  0 siblings, 0 replies; 2+ messages in thread
From: Chris Ball @ 2011-10-12 15:19 UTC (permalink / raw)
  To: Jaehoon Chung; +Cc: linux-mmc, Kyungmin Park

Hi,

On Wed, Oct 12 2011, Jaehoon Chung wrote:
> If sc->clk_bus[ptr] is NULL, happen NULL pointer error.
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> ---
>  drivers/mmc/host/sdhci-s3c.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
> index 82709b6..3d00e72 100644
> --- a/drivers/mmc/host/sdhci-s3c.c
> +++ b/drivers/mmc/host/sdhci-s3c.c
> @@ -567,8 +567,10 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
>  
>   err_req_regs:
>  	for (ptr = 0; ptr < MAX_BUS_CLK; ptr++) {
> -		clk_disable(sc->clk_bus[ptr]);
> -		clk_put(sc->clk_bus[ptr]);
> +		if (sc->clk_bus[ptr]) {
> +			clk_disable(sc->clk_bus[ptr]);
> +			clk_put(sc->clk_bus[ptr]);
> +		}
>  	}
>  
>   err_no_busclks:

Thanks, pushed to mmc-next for 3.2.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-10-12 15:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-12  4:14 [PATCH RESEND] mmc: sdhci-s3c: fix wrong error-control Jaehoon Chung
2011-10-12 15:19 ` Chris Ball

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).