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

Commit 5f07c32e authored Oct 12, 2011 by Peter Ujfalusi Committed by Mark Brown Oct 12, 2011

Input: twl6040-vibra: Check the selected path for vibra



The VIBSELL/R bit in the VIBCTLL/R register tells the source of the data,
which is going to be used to drive the attached motor(s).
Do not allow effect execution if any of the channels are set to receive
audio data.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent 70601ec1

drivers/input/misc/twl6040-vibra.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -201,6 +201,13 @@ static int vibra_play(struct input_dev input, void data,
		struct vibra_info *info = input_get_drvdata(input);
		int ret;

		/* Do not allow effect, while the routing is set to use audio */
		ret = twl6040_get_vibralr_status(info->twl6040);
		if (ret & TWL6040_VIBSEL) {
		dev_info(&input->dev, "Vibra is configured for audio\n");
		return -EBUSY;
		}

		info->weak_speed = effect->u.rumble.weak_magnitude;
		info->strong_speed = effect->u.rumble.strong_magnitude;
		info->direction = effect->direction < EFFECT_DIR_180_DEG ? 1 : -1;