evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "qcom: qpnp-haptic: Disable haptics when enable time specified is zero"

Browse source
This commit is contained in:
Linux Build Service Account 2017-08-08 09:02:09 -07:00 • committed by Gerrit - the friendly Code Review server
commit 6f1a42cbc9
1 changed files with 12 additions and 2 deletions

14
drivers/soc/qcom/qpnp-haptic.c
View file

@ -2233,13 +2233,23 @@ static void qpnp_hap_td_enable(struct timed_output_dev *dev, int time_ms)
timed_dev);
int rc;
if (time_ms <= 0)
if (time_ms < 0)
return;
mutex_lock(&hap->lock);
if (time_ms == 0) {
/* disable haptics */
hrtimer_cancel(&hap->hap_timer);
hap->state = 0;
schedule_work(&hap->work);
mutex_unlock(&hap->lock);
return;
}
if (time_ms < 10)
time_ms = 10;
mutex_lock(&hap->lock);
if (is_sw_lra_auto_resonance_control(hap))
hrtimer_cancel(&hap->auto_res_err_poll_timer);