Merge "msm: qpnp-haptic: add check for haptic state" (32e00ce6) · Commits · e / devices / android_kernel_sony_msm8994

drivers/platform/msm/qpnp-haptic.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -1102,9 +1102,13 @@ static void qpnp_hap_td_enable(struct timed_output_dev *dev, int value)
		mutex_lock(&hap->lock);
		hrtimer_cancel(&hap->hap_timer);

		if (value == 0)
		if (value == 0) {
		if (hap->state == 0) {
		mutex_unlock(&hap->lock);
		return;
		}
		hap->state = 0;
		else {
		} else {
		value = (value > hap->timeout_ms ?
		hap->timeout_ms : value);
		hap->state = 1;