Skip to contentSkip to conversation

Input: arizona-haptic: Correct disable of haptics device

PATCH Applied Charles Keepax 2 participants 2 messages Nov 30, 2015 – Dec 3, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Input: arizona-haptic: Correct disable of haptics device

A small copy and paste error was preventing the haptics device being disabled. This patch corrects the value written on disable.

---
 drivers/input/misc/arizona-haptics.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/input/misc/arizona-haptics.c +1 -2
index 4bf6785..d5994a7 100644
@@ -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);
Signature · 1 line
2.1.4
maintainer Applied
#1 lore raw
Quoted 4 lines · Charles Keepax

A small copy and paste error was preventing the haptics device being disabled. This patch corrects the value written on disable.

Applied, thank you.

Quoted 21 lines
---
 drivers/input/misc/arizona-haptics.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/input/misc/arizona-haptics.c +1 -2
index 4bf6785..d5994a7 100644
@@ -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);
Signature · 1 line
2.1.4
Signature · 1 line
Dmitry