* [PATCH 2.6.33] power_supply: Handle missing platform data gracefully
@ 2010-01-27 20:43 Mark Brown
2010-01-29 14:01 ` Anton Vorontsov
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2010-01-27 20:43 UTC (permalink / raw)
To: Anton Vorontsov; +Cc: Marek Vasut, linux-kernel, Mark Brown
Don't unconditionally dereference the WM97xx core platform data since
it may not be present, causing an oops.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
drivers/power/wm97xx_battery.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c
index fa39e75..6ea3cb5 100644
--- a/drivers/power/wm97xx_battery.c
+++ b/drivers/power/wm97xx_battery.c
@@ -175,8 +175,14 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)
dev_err(&dev->dev, "Do not pass platform_data through "
"wm97xx_bat_set_pdata!\n");
return -EINVAL;
- } else
- pdata = wmdata->batt_pdata;
+ }
+
+ if (!wmdata) {
+ dev_err(&dev->dev, "No platform data supplied\n");
+ return -EINVAL;
+ }
+
+ pdata = wmdata->batt_pdata;
if (dev->id != -1)
return -EINVAL;
--
1.6.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 2.6.33] power_supply: Handle missing platform data gracefully
2010-01-27 20:43 [PATCH 2.6.33] power_supply: Handle missing platform data gracefully Mark Brown
@ 2010-01-29 14:01 ` Anton Vorontsov
0 siblings, 0 replies; 2+ messages in thread
From: Anton Vorontsov @ 2010-01-29 14:01 UTC (permalink / raw)
To: Mark Brown; +Cc: Marek Vasut, linux-kernel
On Wed, Jan 27, 2010 at 08:43:21PM +0000, Mark Brown wrote:
> Don't unconditionally dereference the WM97xx core platform data since
> it may not be present, causing an oops.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
Applied to battery-2.6.33, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-01-29 14:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-27 20:43 [PATCH 2.6.33] power_supply: Handle missing platform data gracefully Mark Brown
2010-01-29 14:01 ` Anton Vorontsov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox