summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2015-12-03 03:13:54 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-12-03 03:22:11 +0300
commit1cf44efa1e4f0adc6998ad3087fa5220b682743c (patch)
treeaed61ef33f8cb9bd4f84d1678732b3b131f22281 /drivers/input
parent8e20cf2bce122ce9262d6034ee5d5b76fbb92f96 (diff)
downloadlinux-1cf44efa1e4f0adc6998ad3087fa5220b682743c.tar.xz
Input: arizona-haptic - fix disabling of haptics device
A small copy and paste error was preventing the haptics device being disabled. This patch corrects the value written on disable. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/arizona-haptics.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c
index 4bf678541496..d5994a745ffa 100644
--- a/drivers/input/misc/arizona-haptics.c
+++ b/drivers/input/misc/arizona-haptics.c
@@ -97,8 +97,7 @@ static void arizona_haptics_work(struct work_struct *work)
ret = regmap_update_bits(arizona->regmap,
ARIZONA_HAPTICS_CONTROL_1,
- ARIZONA_HAP_CTRL_MASK,
- 1 << ARIZONA_HAP_CTRL_SHIFT);
+ ARIZONA_HAP_CTRL_MASK, 0);
if (ret != 0) {
dev_err(arizona->dev, "Failed to stop haptics: %d\n",
ret);