Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixes

[deliverable/linux.git] / drivers / power / ab8500_fg.c

diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index 0ebea39e73fe7d22271e83fac1847dd0ab7be519..bf022255994c86b3d3486e27e1edcc905c7246f4 100644 (file)
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -2446,10 +2446,15 @@ static int __devinit ab8500_fg_probe(struct platform_device *pdev)
 {
        int i, irq;
        int ret = 0;
-       struct abx500_bm_plat_data *plat_data;
+       struct abx500_bm_plat_data *plat_data = pdev->dev.platform_data;
+       struct ab8500_fg *di;
+
+       if (!plat_data) {
+               dev_err(&pdev->dev, "No platform data\n");
+               return -EINVAL;
+       }
 
-       struct ab8500_fg *di =
-               kzalloc(sizeof(struct ab8500_fg), GFP_KERNEL);
+       di = kzalloc(sizeof(*di), GFP_KERNEL);
        if (!di)
                return -ENOMEM;
 
@@ -2461,13 +2466,12 @@ static int __devinit ab8500_fg_probe(struct platform_device *pdev)
        di->gpadc = ab8500_gpadc_get("ab8500-gpadc.0");
 
        /* get fg specific platform data */
-       plat_data = pdev->dev.platform_data;
-       if (!plat_data || !plat_data->fg) {
+       di->pdata = plat_data->fg;
+       if (!di->pdata) {
                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;