aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-04-13 04:16:13 -0400
committerAnton Vorontsov <anton.vorontsov@linaro.org>2012-05-05 06:59:56 -0400
commit5f98eb393c6d7a5de3202b7ce9e4439292e952fb (patch)
treee7c4003b3a34a8420713c066d8c33c19c91780a9 /drivers/power
parentec511672b97383107d87e86921b1f0392bc1d000 (diff)
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 <arun.murthy@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/ab8500_fg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index c22f2f05657e..0ebea39e73fe 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)
2462 2462
2463 /* get fg specific platform data */ 2463 /* get fg specific platform data */
2464 plat_data = pdev->dev.platform_data; 2464 plat_data = pdev->dev.platform_data;
2465 di->pdata = plat_data->fg; 2465 if (!plat_data || !plat_data->fg) {
2466 if (!di->pdata) {
2467 dev_err(di->dev, "no fg platform data supplied\n"); 2466 dev_err(di->dev, "no fg platform data supplied\n");
2468 ret = -EINVAL; 2467 ret = -EINVAL;
2469 goto free_device_info; 2468 goto free_device_info;
2470 } 2469 }
2470 di->pdata = plat_data->fg;
2471 2471
2472 /* get battery specific platform data */ 2472 /* get battery specific platform data */
2473 di->bat = plat_data->battery; 2473 di->bat = plat_data->battery;