summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-27 20:43:21 +0000
committerAnton Vorontsov <avorontsov@ru.mvista.com>2010-01-29 17:00:18 +0300
commit12b336a8b4ea8652372f88521bf55cef7f5d5283 (patch)
tree81f448a4c122a03c2d52d95a838e5f8af4e12693 /drivers/power
parentbe8cde8b24c9dca1e54598690115eee5b1476519 (diff)
downloadlinux-12b336a8b4ea8652372f88521bf55cef7f5d5283.tar.bz2
wm97xx_battery: Handle missing platform data gracefully
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> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/wm97xx_battery.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c
index fa39e759a275..6ea3cb5837c7 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;