Skip to content

Commit

Permalink
wm97xx_battery: Handle missing platform data gracefully
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Brown authored and Anton Vorontsov committed Jan 29, 2010
1 parent be8cde8 commit 12b336a
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions drivers/power/wm97xx_battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 12b336a

Please sign in to comment.