---

yaml --- r: 309678 b: refs/heads/master c: cc28e17 h: refs/heads/master v: v3
git-mirror · May 5, 2012 · 5abf7d0 · 5abf7d0
1 parent b7747a4
commit 5abf7d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cd725a1de1df8e5a2d694abc1e6b6aad5ce7d06
+refs/heads/master: cc28e17100a6b051ef966de81bb2d4a97b2a6645
diff --git a/trunk/drivers/power/ab8500_charger.c b/trunk/drivers/power/ab8500_charger.c
@@ -2551,13 +2551,12 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev)
 
 	/* get charger specific platform data */
 	plat_data = pdev->dev.platform_data;
-	di->pdata = plat_data->charger;
-
-	if (!di->pdata) {
+	if (!plat_data || !plat_data->charger) {
 		dev_err(di->dev, "no charger platform data supplied\n");
 		ret = -EINVAL;
 		goto free_device_info;
 	}
+	di->pdata = plat_data->charger;
 
 	/* get battery specific platform data */
 	di->bat = plat_data->battery;