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

Merge "asoc: codecs: Bail out from clock enable routine during SSR"

Browse Source
This commit is contained in:
qctecmdr
2019-05-07 22:35:09 -07:00
committed by Gerrit - the friendly Code Review server
parent 67c9793310 f4a471de1a
commit e7072b0ae4
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,8 +241,10 @@ static int swrm_clk_request(struct swr_mstr_ctrl *swrm, bool enable)
mutex_lock(&swrm->clklock);
if (enable) {
if (!swrm->dev_up)
if (!swrm->dev_up) {
ret = -ENODEV;
goto exit;
}
swrm->clk_ref_count++;
if (swrm->clk_ref_count == 1) {
ret = swrm->clk(swrm->handle, true);
@@ -1274,7 +1276,10 @@ static irqreturn_t swr_mstr_interrupt(int irq, void *dev)
}
mutex_lock(&swrm->reslock);
swrm_clk_request(swrm, true);
if (swrm_clk_request(swrm, true)) {
mutex_unlock(&swrm->reslock);
goto exit;
}
mutex_unlock(&swrm->reslock);
intr_sts = swr_master_read(swrm, SWRM_INTERRUPT_STATUS);
@@ -1420,6 +1425,7 @@ handle_irq:
mutex_lock(&swrm->reslock);
swrm_clk_request(swrm, false);
mutex_unlock(&swrm->reslock);
exit:
swrm_unlock_sleep(swrm);
return ret;
}