2010-02-07 01:16:17

by Joonyoung Shim

Subject: [PATCH] mfd: Fix WM8994 error handling

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

Signed-off-by: Myungjoo Ham <[email protected]>
Signed-off-by: Joonyoung Shim <[email protected]>
---
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

2010-02-07 23:57:36

by Mark Brown

Subject: Re: [PATCH] mfd: Fix WM8994 error handling

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 <[email protected]>
> Signed-off-by: Joonyoung Shim <[email protected]>

Good catch, thanks.

Acked-by: Mark Brown <[email protected]>

> ---
> 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

2010-02-11 12:25:51

by Samuel Ortiz

Subject: Re: [PATCH] mfd: Fix WM8994 error handling

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 <[email protected]>
> Signed-off-by: Joonyoung Shim <[email protected]>
> ---
> 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/