]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
ab8500_fg: Harden platform data check
authorLinus Walleij <linus.walleij@linaro.org>
Fri, 13 Apr 2012 08:16:13 +0000 (10:16 +0200)
committerAnton Vorontsov <anton.vorontsov@linaro.org>
Sat, 5 May 2012 10:59:56 +0000 (03:59 -0700)
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>
drivers/power/ab8500_fg.c

index c22f2f05657e28d249d619d9a01aaab8a3095bb6..0ebea39e73fe7d22271e83fac1847dd0ab7be519 100644 (file)
@@ -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;