---

yaml --- r: 297941 b: refs/heads/master c: d2c0077 h: refs/heads/master i: 297939: 1a66333 v: v3
git-mirror · Mar 26, 2012 · 3c83a22 · 3c83a22
1 parent 6b46849
commit 3c83a22
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7bae49aa1247a195a3fe4235edf6811c175bb7b
+refs/heads/master: d2c0077c54794d668b3639079a4262a52088d5e2
diff --git a/trunk/drivers/power/isp1704_charger.c b/trunk/drivers/power/isp1704_charger.c
@@ -470,6 +470,7 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
 
 	dev_err(&pdev->dev, "failed to register isp1704 with error %d\n", ret);
 
+	isp1704_charger_set_power(isp, 0);
 	return ret;
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     	dev_err(&pdev->dev, "failed to register isp1704 with error %d\n", ret);
+    	isp1704_charger_set_power(isp, 0);
     	return ret;
     }
@@ Expand Down @@