diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-19 09:51:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-19 09:51:11 -0800 |
| commit | 632f8577d694efa4f2968be32c44e79f7e2ed2cd (patch) | |
| tree | 8ef8dc992a7c9d25e2045fc8fb3ece0b573e1800 /drivers/input/misc | |
| parent | Merge tag 'pm+acpi-4.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| parent | Input: elants_i2c - fix wake-on-touch (diff) | |
| download | linux-dev-632f8577d694efa4f2968be32c44e79f7e2ed2cd.tar.xz linux-dev-632f8577d694efa4f2968be32c44e79f7e2ed2cd.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"Just a few assorted driver fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: elants_i2c - fix wake-on-touch
Input: elan_i2c - set input device's vendor and product IDs
Input: sun4i-lradc-keys - fix typo in binding documentation
Input: atmel_mxt_ts - add maxtouch to I2C table for module autoload
Input: arizona-haptic - fix disabling of haptics device
Input: aiptek - fix crash on detecting device without endpoints
Input: atmel_mxt_ts - add generic platform data for Chromebooks
Input: parkbd - clear unused function pointers
Input: walkera0701 - clear unused function pointers
Input: turbografx - clear unused function pointers
Input: gamecon - clear unused function pointers
Input: db9 - clear unused function pointers
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/arizona-haptics.c | 3 |
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); |