summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLiam Breck <liam@networkimprov.net>2017-01-18 09:26:49 -0800
committerBen Hutchings <ben@decadent.org.uk>2017-06-05 21:16:55 +0100
commitcddddea5a5ddae7cd61b54de55f91b3668c10eca (patch)
tree902bbb0f251a0831d9dcc42c0128395a8797fd5e /drivers
parent42a0e17be3a9c976c085b23271fa1bc7b37439ba (diff)
downloadlinux-stable-cddddea5a5ddae7cd61b54de55f91b3668c10eca.tar.gz
linux-stable-cddddea5a5ddae7cd61b54de55f91b3668c10eca.tar.bz2
linux-stable-cddddea5a5ddae7cd61b54de55f91b3668c10eca.zip
power: supply: bq24190_charger: Call set_mode_host() on pm_resume()
commit e05ad7e0741ce0505e1df157c62b22b95172bb97 upstream. pm_resume() does a register_reset() which clears charger host mode. Fix by calling set_mode_host() after the reset. Fixes: d7bf353fd0aa3 ("bq24190_charger: Add support for TI BQ24190 Battery Charger") Signed-off-by: Liam Breck <kernel@networkimprov.net> Acked-by: Mark Greer <mgreer@animalcreek.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Sebastian Reichel <sre@kernel.org> [bwh: Backported to 3.16: adjust filename] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/power/bq24190_charger.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/bq24190_charger.c b/drivers/power/bq24190_charger.c
index 5c2d62f1e7ea..661afd10d85a 100644
--- a/drivers/power/bq24190_charger.c
+++ b/drivers/power/bq24190_charger.c
@@ -1496,6 +1496,7 @@ static int bq24190_pm_resume(struct device *dev)
pm_runtime_get_sync(bdi->dev);
bq24190_register_reset(bdi);
+ bq24190_set_mode_host(bdi);
pm_runtime_put_sync(bdi->dev);
/* Things may have changed while suspended so alert upper layer */