A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "soc: swr-mstr: exit irq handler if clock req fails"

Browse source
This commit is contained in:
qctecmdr 2019-09-27 09:15:54 -07:00 • committed by Gerrit - the friendly Code Review server
commit 6fc4b30d6b
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
soc/swr-mstr-ctrl.c
View file

@ -1607,6 +1607,12 @@ static irqreturn_t swr_mstr_interrupt_v2(int irq, void *dev)
struct swr_device *swr_dev;
struct swr_master *mstr = &swrm->master;
if (!swrm->dev_up || swrm->state == SWR_MSTR_SSR) {
complete(&swrm->broadcast);
dev_dbg(swrm->dev, "%s swrm is not up\n", __func__);
return IRQ_NONE;
}
if (unlikely(swrm_lock_sleep(swrm) == false)) {
dev_err(swrm->dev, "%s Failed to hold suspend\n", __func__);
return IRQ_NONE;
@ -1621,7 +1627,12 @@ static irqreturn_t swr_mstr_interrupt_v2(int irq, void *dev)
ret = IRQ_NONE;
goto err_audio_hw_vote;
}
swrm_clk_request(swrm, true);
ret = swrm_clk_request(swrm, true);
if (ret) {
dev_err(dev, "%s: swrm clk failed\n", __func__);
ret = IRQ_NONE;
goto err_audio_core_vote;
}
mutex_unlock(&swrm->reslock);
intr_sts = swr_master_read(swrm, SWRM_INTERRUPT_STATUS);
@ -1797,6 +1808,7 @@ handle_irq:
mutex_lock(&swrm->reslock);
swrm_clk_request(swrm, false);
err_audio_core_vote:
swrm_request_hw_vote(swrm, LPASS_AUDIO_CORE, false);
err_audio_hw_vote: