Merge "msm: npu: Avoid mutex dead lock if turning on clocks failed" (98ba0397) · Commits · e / devices / android_kernel_xiaomi_nabu

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;