* [PATCH] mfd: Fix error handling if BUG() isn't enabled in WM8994
@ 2011-06-17 11:19 Mark Brown
2011-06-20 10:16 ` Samuel Ortiz
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2011-06-17 11:19 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: patches, linux-kernel, Mark Brown
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 <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 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mfd: Fix error handling if BUG() isn't enabled in WM8994
2011-06-17 11:19 [PATCH] mfd: Fix error handling if BUG() isn't enabled in WM8994 Mark Brown
@ 2011-06-20 10:16 ` Samuel Ortiz
0 siblings, 0 replies; 2+ messages in thread
From: Samuel Ortiz @ 2011-06-20 10:16 UTC (permalink / raw)
To: Mark Brown; +Cc: patches, linux-kernel
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/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-20 10:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-17 11:19 [PATCH] mfd: Fix error handling if BUG() isn't enabled in WM8994 Mark Brown
2011-06-20 10:16 ` 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.