diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 16:09:17 (GMT) |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 16:09:21 (GMT) |
commit | 065319c229c76ded943a8a7cf55e1e6e1e55ae69 (patch) | |
tree | 6b16c74b13eb2d8147aa346aa0dec247a8cd0a28 /drivers/input/tablet/wacom_wac.c | |
parent | c77ef898625f558c89c6ca0b27e2032f0fad4196 (diff) | |
parent | 63ecf0a9b55ada8c59ac10472c4468b46cf2e97a (diff) | |
download | linux-fsl-qoriq-065319c229c76ded943a8a7cf55e1e6e1e55ae69.tar.xz |
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
* 'board-specific' of git://github.com/hzhuang1/linux:
pxa/hx4700: Remove pcmcia platform_device structure
ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35%
ARM: pxa/hx4700: Remove unwanted request for GPIO105
(update to 3.3-rc7)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/input/tablet/wacom_wac.c')
-rw-r--r-- | drivers/input/tablet/wacom_wac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 88672ec..cd3ed29 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -926,7 +926,7 @@ static int wacom_bpt3_touch(struct wacom_wac *wacom) { struct input_dev *input = wacom->input; unsigned char *data = wacom->data; - int count = data[1] & 0x03; + int count = data[1] & 0x07; int i; if (data[0] != 0x02) |