Skip to content

Commit

Permalink
ab8500_charger: Harden platform data check
Browse files Browse the repository at this point in the history
If no platform data at all is supplied the driver crashes,
extend the checks to be more careful so we can compile in the
driver and boot also without platform data present.

Acked-by: Arun Murthy <arun.murthy@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
  • Loading branch information
Linus Walleij authored and Anton Vorontsov committed May 5, 2012
1 parent 8cd725a commit cc28e17
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/power/ab8500_charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -2551,13 +2551,12 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev)

/* get charger specific platform data */
plat_data = pdev->dev.platform_data;
di->pdata = plat_data->charger;

if (!di->pdata) {
if (!plat_data || !plat_data->charger) {
dev_err(di->dev, "no charger platform data supplied\n");
ret = -EINVAL;
goto free_device_info;
}
di->pdata = plat_data->charger;

/* get battery specific platform data */
di->bat = plat_data->battery;
Expand Down

0 comments on commit cc28e17

Please sign in to comment.