From 2e47afb8ded6715b40897286c0f144c181f27d0e Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Wed, 12 Oct 2011 11:57:56 +0300 Subject: [PATCH] --- yaml --- r: 270851 b: refs/heads/master c: 5f07c32e289d159be3fc1e4f257e8cad5336f83a h: refs/heads/master i: 270849: 2534ab072e9429a86ef8b1d798e1e83b56b3d161 270847: abf67a1a5ca8f9127733c189650ee8e7ab4b5232 v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/twl6040-vibra.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9b41e87b5366..e0ef40ff4c15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70601ec10a2450369d554e49d708ab26deb17b66 +refs/heads/master: 5f07c32e289d159be3fc1e4f257e8cad5336f83a diff --git a/trunk/drivers/input/misc/twl6040-vibra.c b/trunk/drivers/input/misc/twl6040-vibra.c index cb741858229a..2a828e53db58 100644 --- a/trunk/drivers/input/misc/twl6040-vibra.c +++ b/trunk/drivers/input/misc/twl6040-vibra.c @@ -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;