| Message ID | 1448906540-15356-1-git-send-email-ckeepax@opensource.wolfsonmicro.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, Nov 30, 2015 at 06:02:20PM +0000, Charles Keepax wrote: > 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> Applied, thank you. > --- > drivers/input/misc/arizona-haptics.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c > index 4bf6785..d5994a7 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); > -- > 2.1.4 >
diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c index 4bf6785..d5994a7 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);
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> --- drivers/input/misc/arizona-haptics.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)