Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit cc28e171 authored Apr 13, 2012 by Linus Walleij Committed by Anton Vorontsov May 05, 2012

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: Arun Murthy <arun.murthy@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>

parent 8cd725a1

drivers/power/ab8500_charger.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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;