All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] mfd: Fix WM8994 error handling
@ 2010-02-07  1:16 Joonyoung Shim
  2010-02-07 23:57 ` Mark Brown
  2010-02-11 12:27 ` Samuel Ortiz
  0 siblings, 2 replies; 3+ messages in thread
From: Joonyoung Shim @ 2010-02-07  1:16 UTC (permalink / raw)
  To: sameo; +Cc: linux-kernel, broonie, kyungmin.park, myungjoo.ham

This patch fixes wrong goto statement for error handling on probe.

Signed-off-by: Myungjoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
---
 drivers/mfd/wm8994-core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 299c1af..844e1c1 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -305,14 +305,14 @@ static int wm8994_device_init(struct wm8994 *wm8994, unsigned long id, int irq)
 				 wm8994->supplies);
 	if (ret != 0) {
 		dev_err(wm8994->dev, "Failed to get supplies: %d\n", ret);
-		goto err_get;
+		goto err_supplies;
 	}
 
 	ret = regulator_bulk_enable(ARRAY_SIZE(wm8994_main_supplies),
 				    wm8994->supplies);
 	if (ret != 0) {
 		dev_err(wm8994->dev, "Failed to enable supplies: %d\n", ret);
-		goto err_supplies;
+		goto err_get;
 	}
 
 	ret = wm8994_reg_read(wm8994, WM8994_SOFTWARE_RESET);
-- 
1.6.3.3

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

* Re: [PATCH] mfd: Fix WM8994 error handling
  2010-02-07  1:16 [PATCH] mfd: Fix WM8994 error handling Joonyoung Shim
@ 2010-02-07 23:57 ` Mark Brown
  2010-02-11 12:27 ` Samuel Ortiz
  1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2010-02-07 23:57 UTC (permalink / raw)
  To: Joonyoung Shim; +Cc: sameo, linux-kernel, kyungmin.park, myungjoo.ham

On Sun, Feb 07, 2010 at 10:16:14AM +0900, Joonyoung Shim wrote:
> This patch fixes wrong goto statement for error handling on probe.
> 
> Signed-off-by: Myungjoo Ham <myungjoo.ham@samsung.com>
> Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>

Good catch, thanks.

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

> ---
>  drivers/mfd/wm8994-core.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
> index 299c1af..844e1c1 100644
> --- a/drivers/mfd/wm8994-core.c
> +++ b/drivers/mfd/wm8994-core.c
> @@ -305,14 +305,14 @@ static int wm8994_device_init(struct wm8994 *wm8994, unsigned long id, int irq)
>  				 wm8994->supplies);
>  	if (ret != 0) {
>  		dev_err(wm8994->dev, "Failed to get supplies: %d\n", ret);
> -		goto err_get;
> +		goto err_supplies;
>  	}
>  
>  	ret = regulator_bulk_enable(ARRAY_SIZE(wm8994_main_supplies),
>  				    wm8994->supplies);
>  	if (ret != 0) {
>  		dev_err(wm8994->dev, "Failed to enable supplies: %d\n", ret);
> -		goto err_supplies;
> +		goto err_get;
>  	}
>  
>  	ret = wm8994_reg_read(wm8994, WM8994_SOFTWARE_RESET);
> -- 
> 1.6.3.3

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

* Re: [PATCH] mfd: Fix WM8994 error handling
  2010-02-07  1:16 [PATCH] mfd: Fix WM8994 error handling Joonyoung Shim
  2010-02-07 23:57 ` Mark Brown
@ 2010-02-11 12:27 ` Samuel Ortiz
  1 sibling, 0 replies; 3+ messages in thread
From: Samuel Ortiz @ 2010-02-11 12:27 UTC (permalink / raw)
  To: Joonyoung Shim; +Cc: linux-kernel, broonie, kyungmin.park, myungjoo.ham

Hi,

On Sun, Feb 07, 2010 at 10:16:14AM +0900, Joonyoung Shim wrote:
> This patch fixes wrong goto statement for error handling on probe.
Patch applied, many thanks.

Cheers,
Samuel.


> Signed-off-by: Myungjoo Ham <myungjoo.ham@samsung.com>
> Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
> ---
>  drivers/mfd/wm8994-core.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
> index 299c1af..844e1c1 100644
> --- a/drivers/mfd/wm8994-core.c
> +++ b/drivers/mfd/wm8994-core.c
> @@ -305,14 +305,14 @@ static int wm8994_device_init(struct wm8994 *wm8994, unsigned long id, int irq)
>  				 wm8994->supplies);
>  	if (ret != 0) {
>  		dev_err(wm8994->dev, "Failed to get supplies: %d\n", ret);
> -		goto err_get;
> +		goto err_supplies;
>  	}
>  
>  	ret = regulator_bulk_enable(ARRAY_SIZE(wm8994_main_supplies),
>  				    wm8994->supplies);
>  	if (ret != 0) {
>  		dev_err(wm8994->dev, "Failed to enable supplies: %d\n", ret);
> -		goto err_supplies;
> +		goto err_get;
>  	}
>  
>  	ret = wm8994_reg_read(wm8994, WM8994_SOFTWARE_RESET);
> -- 
> 1.6.3.3

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

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

end of thread, other threads:[~2010-02-11 12:25 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-02-07  1:16 [PATCH] mfd: Fix WM8994 error handling Joonyoung Shim
2010-02-07 23:57 ` Mark Brown
2010-02-11 12:27 ` Samuel Ortiz

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.