# \[External\]\[PATCH\] power: supply: bq2415x: fix deadlock in bq2415x\_set\_autotimer

- From: Kezhou Li \<hidden\>
- Date: 2021-06-21 12:43:10 
- List: linux-pm
- Page: https://ratatoskr.run/linux-pm/2021/06/1420744
- Thread: https://ratatoskr.run/linux-pm/2021/06/1420744/t.md

```text
From: "Kezhou Li" <redacted>

The bq2415x_timer_error called by bq2415x_timer_work when some error
happens, and then calls cancel_delayed_work_sync(&bq->work). Finally
this function is waiting for the work to finish but the work is
waiting for the return of the function. So it causes a deadlock.

Signed-off-by: Kezhou Li <redacted>
---
 drivers/power/supply/bq2415x_charger.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/power/supply/bq2415x_charger.c b/drivers/power/supply/bq2415x_charger.c
index 5724001..7889edb 100644
--- a/drivers/power/supply/bq2415x_charger.c
+++ b/drivers/power/supply/bq2415x_charger.c
@@ -862,8 +862,6 @@ static void bq2415x_set_autotimer(struct bq2415x_device *bq, int state)
 		schedule_delayed_work(&bq->work, BQ2415X_TIMER_TIMEOUT * HZ);
 		bq2415x_exec_command(bq, BQ2415X_TIMER_RESET);
 		bq->timer_error = NULL;
-	} else {
-		cancel_delayed_work_sync(&bq->work);
 	}
 
 	mutex_unlock(&bq2415x_timer_mutex);
-- 
1.9.1

```