From: Linus Walleij Date: Fri, 13 Apr 2012 08:15:49 +0000 (+0200) Subject: ab8500_charger: Harden platform data check X-Git-Tag: v3.5-rc1~23^2~17 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cc28e17100a6b051ef966de81bb2d4a97b2a6645;p=karo-tx-linux.git 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 Signed-off-by: Linus Walleij Signed-off-by: Anton Vorontsov --- diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c index e2b4accbec88..79dc584a53ed 100644 --- a/drivers/power/ab8500_charger.c +++ b/drivers/power/ab8500_charger.c @@ -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;