Commit cc28e171 authored by Linus Walleij's avatar Linus Walleij Committed by Anton Vorontsov

ab8500_charger: Harden platform data check

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: default avatarArun Murthy <arun.murthy@stericsson.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarAnton Vorontsov <anton.vorontsov@linaro.org>
parent 8cd725a1
...@@ -2551,13 +2551,12 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev) ...@@ -2551,13 +2551,12 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev)
/* get charger specific platform data */ /* get charger specific platform data */
plat_data = pdev->dev.platform_data; plat_data = pdev->dev.platform_data;
di->pdata = plat_data->charger; if (!plat_data || !plat_data->charger) {
if (!di->pdata) {
dev_err(di->dev, "no charger platform data supplied\n"); dev_err(di->dev, "no charger platform data supplied\n");
ret = -EINVAL; ret = -EINVAL;
goto free_device_info; goto free_device_info;
} }
di->pdata = plat_data->charger;
/* get battery specific platform data */ /* get battery specific platform data */
di->bat = plat_data->battery; di->bat = plat_data->battery;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment