aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorGraeme Gregory <gg@slimlogic.co.uk>2012-02-15 15:15:23 +0000
committerZiyann <jaraidaniel@gmail.com>2014-10-01 13:00:21 +0200
commitf1f7ac6b61db810f35ab0ebdb82b59c718a45322 (patch)
tree5ca2e757c199a21391368c0afe8c9c4b72dcf6d2 /drivers/power
parentc70cd4b24efc6a1f1e10ecb7e75451c7c612f3c8 (diff)
downloadkernel_samsung_tuna-f1f7ac6b61db810f35ab0ebdb82b59c718a45322.zip
kernel_samsung_tuna-f1f7ac6b61db810f35ab0ebdb82b59c718a45322.tar.gz
kernel_samsung_tuna-f1f7ac6b61db810f35ab0ebdb82b59c718a45322.tar.bz2
POWER: twl6030_bci_battery remove unneeded state
Removed state from state machine that was preventing the processing of VAC insert events. Change-Id: I6f9f24bbd787c84bc5ea2f44edcbd4b1bef261bd Signed-off-by: Graeme Gregory <gg@slimlogic.co.uk>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/twl6030_bci_battery.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/power/twl6030_bci_battery.c b/drivers/power/twl6030_bci_battery.c
index 48e670e..b9024ad 100644
--- a/drivers/power/twl6030_bci_battery.c
+++ b/drivers/power/twl6030_bci_battery.c
@@ -836,8 +836,6 @@ static irqreturn_t twl6030charger_ctrl_interrupt(int irq, void *_di)
if (!((di->features & TWL6032_SUBCLASS) &&
di->platform_data->use_hw_charger)) {
- if (!(stat_reset & (VBUS_DET | VAC_DET)))
- goto stat_fault;
if (stat_reset & VBUS_DET) {
/* On a USB detach, UNMASK VBUS OVP if masked*/
ret = twl_i2c_read_u8(TWL6030_MODULE_CHARGER, &temp,
@@ -926,8 +924,6 @@ static irqreturn_t twl6030charger_ctrl_interrupt(int irq, void *_di)
charger_fault = 1;
dev_dbg(di->dev, "Fault watchdog fired\n");
}
-
-stat_fault:
if (stat_reset & CONTROLLER_STAT1_FAULT_WDG)
dev_dbg(di->dev, "Fault watchdog recovered\n");
if (stat_set & CONTROLLER_STAT1_BAT_REMOVED)