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 <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Anton Vorontsov <[email protected]>
chrispat · May 5, 2012 · 5f98eb3 · 5f98eb3
1 parent ec51167
commit 5f98eb3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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;