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

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

Merge "soundwire: return error if vote for LPASS HW Core fails"

parents 586382a7 035c50b0

soc/swr-mstr-ctrl.c

+10 −2
Original line number Diff line number Diff line
@@ -1447,8 +1447,15 @@ static irqreturn_t swr_mstr_interrupt_v2(int irq, void *dev) 
	}



	mutex_lock(&swrm->reslock);

	if (swrm->lpass_core_hw_vote)

		clk_prepare_enable(swrm->lpass_core_hw_vote);

	if (swrm->lpass_core_hw_vote) {

		ret = clk_prepare_enable(swrm->lpass_core_hw_vote);

		if (ret < 0) {

			dev_err(dev, "%s:lpass core hw enable failed\n",

				__func__);

			ret = IRQ_NONE;

			goto exit;

		}

	}

	swrm_clk_request(swrm, true);

	mutex_unlock(&swrm->reslock);
@@ -1618,6 +1625,7 @@ static irqreturn_t swr_mstr_interrupt_v2(int irq, void *dev) 
	swrm_clk_request(swrm, false);

	if (swrm->lpass_core_hw_vote)

		clk_disable_unprepare(swrm->lpass_core_hw_vote);

exit:

	mutex_unlock(&swrm->reslock);

	swrm_unlock_sleep(swrm);

	return ret;