diff options
author | MorganX Binet <morganx.binet@intel.com> | 2017-04-04 15:46:07 +0200 |
---|---|---|
committer | Bertolin, PierreX <pierrex.bertolin@intel.com> | 2017-04-07 00:51:14 -0700 |
commit | 18bc18f80a5dc2607020a4d4ae82e0df1f3d9736 (patch) | |
tree | f5b8c340741dffa589cc7dd1d3e5da022e98c5ca | |
parent | 6fee43724a2a94ed85b7a395dbb7ac103a8eb406 (diff) | |
download | x86-18bc18f80a5dc2607020a4d4ae82e0df1f3d9736.tar.gz |
em: take wakelock for all types of cables
wakelock is needed while charging,
it is already taken while connected with any other kind
of cables than SDP/CDP (host), because ADB holds it
when connected to host;
when ADB is deactivated then no wakelock is held
this patch makes bq25898 taking it, so it does
not depend on otherdrivers
Change-Id: I12ba637c69042e79d45f236ad804d2392bdbd49a
Tracked-On: https://jira01.devtools.intel.com/browse/AW-4831
Signed-off-by: MorganX Binet <morganx.binet@intel.com>
Reviewed-on: https://android.intel.com/576626
Reviewed-by: Ferrari, AlainX <alainx.ferrari@intel.com>
Reviewed-by: Ghaddab, RiadhX <riadhx.ghaddab@intel.com>
Reviewed-by: Bel Aj Ali, HabibX <habibx.bel.aj.ali@intel.com>
Reviewed-by: Akue, LoicX <loicx.akue@intel.com>
Reviewed-by: Tasayco Loarte, VictorX <victorx.tasayco.loarte@intel.com>
-rw-r--r-- | drivers/power/bq25898_charger.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/power/bq25898_charger.c b/drivers/power/bq25898_charger.c index 92286337f931..5a646f8e1d30 100644 --- a/drivers/power/bq25898_charger.c +++ b/drivers/power/bq25898_charger.c @@ -598,10 +598,8 @@ static int bq25898_usb_change_notifier(struct notifier_block *self, unsigned lon /* schedule battery monitoring */ schedule_delayed_work(&chip->batmon_work, BQ25898_BAT_MONITOR_DELAY_FIRST); - /* wakelock : lock (suspend disabled), when not already locked, and not on SDP or CDP (host) detection */ - if (!wake_lock_active(&chip->charger_wlock) && - (caps->chrg_type != POWER_SUPPLY_CHARGER_TYPE_USB_SDP) && - (caps->chrg_type != POWER_SUPPLY_CHARGER_TYPE_USB_CDP)) { + /* wakelock : lock (suspend disabled), when not already locked */ + if (!wake_lock_active(&chip->charger_wlock)) { dev_dbg(&chip->client->dev, "locking wakelock\n"); wake_lock(&chip->charger_wlock); } |