Merge "power: qpnp-qg: Fix the possible deadlock during suspend" (e9408277) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/power/supply/qcom/qpnp-qg.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -4310,7 +4310,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;

		@@ -4477,6 +4476,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);