samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
qctecmdr
2019-05-18 02:55:52 -07:00
committed by Gerrit - the friendly Code Review server
parent 586382a701 035c50b0bd
commit 8105363ccb
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
soc/swr-mstr-ctrl.c
View File

@@ -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 @@ handle_irq:
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;