---

yaml --- r: 309691 b: refs/heads/master c: 81a0838 h: refs/heads/master i: 309689: 6fb169f 309687: 8147fb1 v: v3
git-mirror · May 6, 2012 · 47b1082 · 47b1082
1 parent fc4c3e0
commit 47b1082
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13f2483cd5e3df425cfa492cc62cf8fada5d01b9
+refs/heads/master: 81a08382aeb802ad642ab7f2a7786baa7bafaaa3
diff --git a/trunk/drivers/power/isp1704_charger.c b/trunk/drivers/power/isp1704_charger.c
@@ -474,13 +474,13 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
 fail2:
 	power_supply_unregister(&isp->psy);
 fail1:
+	isp1704_charger_set_power(isp, 0);
 	usb_put_transceiver(isp->phy);
 fail0:
 	kfree(isp);
 
 	dev_err(&pdev->dev, "failed to register isp1704 with error %d\n", ret);
 
-	isp1704_charger_set_power(isp, 0);
 	return ret;
 }