---

yaml --- r: 309680 b: refs/heads/master c: 5f98eb3 h: refs/heads/master v: v3
git-mirror · May 5, 2012 · 7e3c651 · 7e3c651
1 parent dd6db8b
commit 7e3c651
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec511672b97383107d87e86921b1f0392bc1d000
+refs/heads/master: 5f98eb393c6d7a5de3202b7ce9e4439292e952fb
diff --git a/trunk/drivers/power/ab8500_fg.c b/trunk/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;