From 5f98eb393c6d7a5de3202b7ce9e4439292e952fb Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Fri, 13 Apr 2012 10:16:13 +0200 Subject: ab8500_fg: 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 --- drivers/power/ab8500_fg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c index c22f2f05657..0ebea39e73f 100644 --- a/drivers/power/ab8500_fg.c +++ b/drivers/power/ab8500_fg.c @@ -2462,12 +2462,12 @@ static int __devinit ab8500_fg_probe(struct platform_device *pdev) /* get fg specific platform data */ plat_data = pdev->dev.platform_data; - di->pdata = plat_data->fg; - if (!di->pdata) { + if (!plat_data || !plat_data->fg) { dev_err(di->dev, "no fg platform data supplied\n"); ret = -EINVAL; goto free_device_info; } + di->pdata = plat_data->fg; /* get battery specific platform data */ di->bat = plat_data->battery; -- cgit v1.2.3-70-g09d2