* [PATCH] Input: arizona-haptic: Correct disable of haptics device
@ 2015-11-30 18:02 ` Charles Keepax
0 siblings, 0 replies; 3+ messages in thread
From: Charles Keepax @ 2015-11-30 18:02 UTC (permalink / raw)
To: dmitry.torokhov; +Cc: linux-input, linux-kernel, patches
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] Input: arizona-haptic: Correct disable of haptics device
@ 2015-11-30 18:02 ` Charles Keepax
0 siblings, 0 replies; 3+ messages in thread
From: Charles Keepax @ 2015-11-30 18:02 UTC (permalink / raw)
To: dmitry.torokhov; +Cc: linux-input, linux-kernel, patches
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Input: arizona-haptic: Correct disable of haptics device
2015-11-30 18:02 ` Charles Keepax
(?)
@ 2015-12-03 0:16 ` Dmitry Torokhov
-1 siblings, 0 replies; 3+ messages in thread
From: Dmitry Torokhov @ 2015-12-03 0:16 UTC (permalink / raw)
To: Charles Keepax; +Cc: linux-input, linux-kernel, patches
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
>
--
Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-12-03 0:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-30 18:02 [PATCH] Input: arizona-haptic: Correct disable of haptics device Charles Keepax
2015-11-30 18:02 ` Charles Keepax
2015-12-03 0:16 ` Dmitry Torokhov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.