---

yaml --- r: 330474 b: refs/heads/master c: 588d4f0 h: refs/heads/master v: v3
git-mirror · Aug 23, 2012 · 1283009 · 1283009
1 parent 8d6dea1
commit 1283009
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc2bc0c29a4e32da13ab75101edde030a6362d10
+refs/heads/master: 588d4f0b05c9bb09c2474460be78f41813b2d861
diff --git a/trunk/drivers/power/wm97xx_battery.c b/trunk/drivers/power/wm97xx_battery.c
@@ -212,8 +212,10 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)
 		props++;	/* POWER_SUPPLY_PROP_VOLTAGE_MIN */
 
 	prop = kzalloc(props * sizeof(*prop), GFP_KERNEL);
-	if (!prop)
+	if (!prop) {
+		ret = -ENOMEM;
 		goto err3;
+	}
 
 	prop[i++] = POWER_SUPPLY_PROP_PRESENT;
 	if (pdata->charge_gpio >= 0)