diff options
| author | Magnus Persson <magnus.p.persson@stericsson.com> | 2011-09-05 13:14:08 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 08:50:35 +0100 |
| commit | 46be5a3f4b056eaaf42042b20e3b0f611bc04a6d (patch) | |
| tree | 558546364658a538c03353d55732006520baad4b /drivers/power | |
| parent | 4315e23fba65af06aabf19845c24c8af84675f7a (diff) | |
power: ab8500_charger: Fix detection of USB charger
Check both VBUS_DET_DBNC1 and VBUS_DET_DBNC100 bits when detecting
USB charger.
ST-Ericsson ID: 358849
ST-Ericsson FOSS-OUT ID: Trivial
ST-Ericsson Linux next: NA
Change-Id: Ibca02e5bd89f556fe649eec7f75f105036bcff2f
Signed-off-by: Magnus Persson <magnus.p.persson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30105
Reviewed-by: Daniel WILLERUD <daniel.willerud@stericsson.com>
Reviewed-by: QABUILD
Reviewed-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com>
Reviewed-by: QATEST
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30882
Reviewed-by: Johan PALSSON <johan.palsson@stericsson.com>
Reviewed-by: Arun MURTHY <arun.murthy@stericsson.com>
Tested-by: Arun MURTHY <arun.murthy@stericsson.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/ab8500_charger.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c index dee8612fa6e..a75abd98ecb 100644 --- a/drivers/power/ab8500_charger.c +++ b/drivers/power/ab8500_charger.c @@ -439,7 +439,7 @@ static int ab8500_charger_detect_chargers(struct ab8500_charger *di) goto out; } - if (val & (VBUS_DET_DBNC100 | VBUS_DET_DBNC1)) + if ((val & VBUS_DET_DBNC1) && (val & VBUS_DET_DBNC100)) result |= USB_PW_CONN; /* |