summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2012-02-01 03:03:47 +0200
committerAnton Vorontsov <anton.vorontsov@linaro.org>2012-03-26 20:41:00 +0400
commitd2c0077c54794d668b3639079a4262a52088d5e2 (patch)
tree38e2e440aec4ac502d3f58160f2c8703f9bd2c81 /drivers/power
parentf7bae49aa1247a195a3fe4235edf6811c175bb7b (diff)
downloadlinux-3.10-d2c0077c54794d668b3639079a4262a52088d5e2.tar.gz
linux-3.10-d2c0077c54794d668b3639079a4262a52088d5e2.tar.bz2
linux-3.10-d2c0077c54794d668b3639079a4262a52088d5e2.zip
isp1704_charger: Fix probe error path
We enable power, but don't disable it in case of an error. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/isp1704_charger.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index b806667b59a..cce6211b805 100644
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -470,6 +470,7 @@ fail0:
dev_err(&pdev->dev, "failed to register isp1704 with error %d\n", ret);
+ isp1704_charger_set_power(isp, 0);
return ret;
}