Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 930a7d64 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: bgdaemon: soft reset bg before bg-twm load"

parents 53d4cdfc b1d318f2

drivers/soc/qcom/bgcom_interface.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ static void bgcom_load_twm_bg_work(struct work_struct *work) 
		pr_err("bg-wear is already loaded\n");

		subsystem_put(dev->pil_h);

		dev->pil_h = NULL;

		bg_soft_reset();

	} else {

		dev->bg_twm_wear_load = true;

		dev->pil_h = subsystem_get_with_fwname("bg-wear",
@@ -617,6 +616,7 @@ static int ssr_bg_cb(struct notifier_block *this, 
		break;

	case SUBSYS_AFTER_SHUTDOWN:

		if (dev->pending_bg_twm_wear_load) {

			bg_soft_reset();

			/* Load bg-twm */

			dev->pending_bg_twm_wear_load = false;

			queue_work(dev->bgdaemon_wq,