2011-06-17 11:19:45

by Mark Brown

Subject: [PATCH] mfd: Fix error handling if BUG() isn't enabled in WM8994

Even if we would've BUG()ed we should still tidy up after ourselves if that
isn't enabled in the kernel config.

Signed-off-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 088ee80..ff50cf7 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -422,7 +422,7 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
break;
default:
BUG();
- return -EINVAL;
+ goto err;
}

wm8994->supplies = kzalloc(sizeof(struct regulator_bulk_data) *
@@ -448,7 +448,7 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
break;
default:
BUG();
- return -EINVAL;
+ goto err;
}

ret = regulator_bulk_get(wm8994->dev, wm8994->num_supplies,
--
1.7.5.4

2011-06-20 10:17:07

by Samuel Ortiz

Subject: Re: [PATCH] mfd: Fix error handling if BUG() isn't enabled in WM8994

Hi Mark,

On Fri, Jun 17, 2011 at 12:19:41PM +0100, Mark Brown wrote:
> Even if we would've BUG()ed we should still tidy up after ourselves if that
> isn't enabled in the kernel config.
I applied this one as well, thanks.

Cheers,
Samuel.

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