Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1625d8d1 authored by Fenglin Wu's avatar Fenglin Wu
Browse files

input: qcom-hv-haptics: set effect to NULL in constant playing 



In constant waveform playing, there is no need to use an effect data
structure to capture the current playing effect, hence set it to NULL.
This also helps the set_gain() callback to use the correct Vmax when
it's called in constant playing case. Also add a debug message to show
the Vmax setting.

Change-Id: I763ec7407b8696300dbe93f5e6935900544e75a8
Signed-off-by: default avatarFenglin Wu <fenglinw@codeaurora.org>
parent 6c1fe6cb

drivers/input/misc/qcom-hv-haptics.c

+5 −0
Original line number Diff line number Diff line
@@ -840,6 +840,8 @@ static int haptics_set_vmax_mv(struct haptics_chip *chip, u32 vmax_mv) 
			HAP_CFG_VMAX_REG, &val, 1);

	if (rc < 0)

		dev_err(chip->dev, "config VMAX failed, rc=%d\n", rc);

	else

		dev_dbg(chip->dev, "Set Vmax to %u mV\n", vmax_mv);



	return rc;

}
@@ -1313,6 +1315,9 @@ static int haptics_load_constant_effect(struct haptics_chip *chip, u8 amplitude) 
		goto unlock;

	}



	/* No effect data when playing constant waveform */

	play->effect = NULL;



	/* configure VMAX in case it was changed in previous effect playing */

	rc = haptics_set_vmax_mv(chip, chip->config.vmax_mv);

	if (rc < 0)