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

Commit 6a1bd6d2 authored by Jilai Wang's avatar Jilai Wang
Browse files

msm: npu: Avoid mutex dead lock if turning on clocks failed 



This change is to fix an issue which will casue mutex dead lock
if turning on clocks failed.

Change-Id: Ib9e26315e4da1fda18739e319bccec819315c3c5
Signed-off-by: default avatarJilai Wang <jilaiw@codeaurora.org>
parent 6e902980

drivers/media/platform/msm/npu/npu_dev.c

+3 −2
Original line number Diff line number Diff line
@@ -631,17 +631,18 @@ int npu_enable_core_power(struct npu_device *npu_dev) 
	if (!pwr->pwr_vote_num) {

		ret = npu_enable_regulators(npu_dev);

		if (ret)

			return ret;

			goto fail;



		ret = npu_enable_core_clocks(npu_dev);

		if (ret) {

			npu_disable_regulators(npu_dev);

			pwr->pwr_vote_num = 0;

			return ret;

			goto fail;

		}

		npu_resume_devbw(npu_dev);

	}

	pwr->pwr_vote_num++;

fail:

	mutex_unlock(&npu_dev->dev_lock);



	return ret;