malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "power: qpnp-qg: Fix the possible deadlock during suspend"

Browse Source
This commit is contained in:
qctecmdr 2020-03-09 10:38:29 -07:00 committed by Gerrit - the friendly Code Review server
commit 8cfcc8ca05
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/power/supply/qcom/qpnp-qg.c
View File

@ -4217,7 +4217,6 @@ static int process_suspend(struct qpnp_qg *chip)
return 0;
cancel_delayed_work_sync(&chip->ttf->ttf_work);
cancel_delayed_work_sync(&chip->qg_sleep_exit_work);
chip->suspend_data = false;
@ -4384,6 +4383,9 @@ static int qpnp_qg_suspend_noirq(struct device *dev)
int rc;
struct qpnp_qg *chip = dev_get_drvdata(dev);
/* cancel any pending sleep_exit work */
cancel_delayed_work_sync(&chip->qg_sleep_exit_work);
mutex_lock(&chip->data_lock);
rc = process_suspend(chip);