From 47b1082958454ac3504bb1a8ecf181661a2b89eb Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 27 Mar 2012 23:22:13 +0300 Subject: [PATCH] --- yaml --- r: 309691 b: refs/heads/master c: 81a08382aeb802ad642ab7f2a7786baa7bafaaa3 h: refs/heads/master i: 309689: 6fb169ff5387f4448f34e9726be170cc9bf822fa 309687: 8147fb1e615d434fa7c0d84c9c19a146187c4c46 v: v3 --- [refs] | 2 +- trunk/drivers/power/isp1704_charger.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b724c38fd27f..ceae2674ecc3 100644 --- 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 index 39eb50f35f09..e5ccd2979773 100644 --- 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; }