summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Calleja <diegocg@gmail.com>2012-12-03 21:16:11 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-11 09:18:39 -0800
commit2bf3364673ef36af85003ead8247313f78df515a (patch)
tree405723c62d6787b950a1cd33a628baa7f72060bc
parentdf433c41eb955760b92949c2d7a229ace30789db (diff)
downloadlinux-stable-2bf3364673ef36af85003ead8247313f78df515a.tar.gz
linux-stable-2bf3364673ef36af85003ead8247313f78df515a.tar.bz2
linux-stable-2bf3364673ef36af85003ead8247313f78df515a.zip
Input: wacom - fix touch support for Bamboo Fun CTH-461
commit e12b3cecf221644ccab64d7c30a6df58b7630cb0 upstream. Commit f393ee2b814e3291c12565000210b3cf10aa5c1d forgot to add the touch_max property for Wacom Bamboo Fun CTH-461/S, ID 056a:00d2. This broke the touch functionality for that device. This patch, (done with help of Ping Cheng), adds the correct value and makes touch work again. Signed-off-by: Diego Calleja <diegocg@gmail.com> Reviewed-by: Ping Cheng <pinglinux@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/input/tablet/wacom_wac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 0a67031ffc13..c2bfe9242cc5 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -2034,7 +2034,8 @@ static const struct wacom_features wacom_features_0xD1 =
.touch_max = 2 };
static const struct wacom_features wacom_features_0xD2 =
{ "Wacom Bamboo Craft", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023,
- 31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+ 31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+ .touch_max = 2 };
static const struct wacom_features wacom_features_0xD3 =
{ "Wacom Bamboo 2FG 6x8", WACOM_PKGLEN_BBFUN, 21648, 13700, 1023,
31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,