joy/android_kernel_sony_sdm845
Watch
1
Fork
You've already forked android_kernel_sony_sdm845
 0
Code Issues Pull requests Projects Releases Wiki Activity

thermal: qpnp-adc-tm: Fix inconsistent locking

Browse source 
This patch addresses the following locking error:

qpnp-adc-tm.c:2979 qpnp_adc_tm_disable_chan_meas() warn: inconsistent
returns 'mutex:&chip->adc->adc_lock'

Bug: 77543262
Test: build & boot
Change-Id: I65ed72180740598a3aef7af72c6e25b297996782
Signed-off-by: David Lin <dtwlin@google.com>
This commit is contained in:
David Lin 2018-06-28 12:02:05 -07:00 • committed by Michael Bestas
commit 62386bac68
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/thermal/qpnp-adc-tm.c
View file

@ -2938,21 +2938,21 @@ int32_t qpnp_adc_tm_disable_chan_meas(struct qpnp_adc_tm_chip *chip,
QPNP_BTM_Mn_HIGH_THR_INT_EN, false);
if (rc < 0) {
pr_err("high thr disable err:%d\n", btm_chan_num);
return rc;
goto fail;
}
rc = qpnp_adc_tm_reg_update(chip, QPNP_BTM_Mn_EN(btm_chan_num),
QPNP_BTM_Mn_LOW_THR_INT_EN, false);
if (rc < 0) {
pr_err("low thr disable err:%d\n", btm_chan_num);
return rc;
goto fail;
}
rc = qpnp_adc_tm_reg_update(chip, QPNP_BTM_Mn_EN(btm_chan_num),
QPNP_BTM_Mn_MEAS_EN, false);
if (rc < 0) {
pr_err("multi measurement disable failed\n");
return rc;
goto fail;
}
}