| From 3bfa321e662edf90fb8123a02c987c2965fa50bb Mon Sep 17 00:00:00 2001 |
| From: Yan Li <yan.i.li@intel.com> |
| Date: Tue, 30 Nov 2010 23:51:03 -0800 |
| Subject: Input: synaptics - fix handling of 2-button ClickPads |
| |
| From: Yan Li <yan.i.li@intel.com> |
| |
| commit 3bfa321e662edf90fb8123a02c987c2965fa50bb upstream. |
| |
| Lenovo S10-3t's ClickPad is a 2-button ClickPad that reports BTN_LEFT |
| and BTN_RIGHT as normal touchpad, unlike the 1-button ClickPad used in |
| HP mini 210 that reports solely BTN_MIDDLE. |
| |
| In 0xc0-cap response, the 1-button ClickPad has the 20-bit set while |
| 2-button ClickPad has the 8-bit set. |
| |
| This patch makes the kernel only handle 1-button ClickPad specially, |
| and treat 2-button ClickPad in the same fashion as regular touchpads. |
| |
| This fixes kernel bug #18122 and MeeGo bug #4807. |
| |
| Signed-off-by: Yan Li <yan.i.li@intel.com> |
| Signed-off-by: Dmitry Torokhov <dtor@mail.ru> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/input/mouse/synaptics.h | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/input/mouse/synaptics.h |
| +++ b/drivers/input/mouse/synaptics.h |
| @@ -51,7 +51,8 @@ |
| #define SYN_EXT_CAP_REQUESTS(c) (((c) & 0x700000) >> 20) |
| #define SYN_CAP_MULTI_BUTTON_NO(ec) (((ec) & 0x00f000) >> 12) |
| #define SYN_CAP_PRODUCT_ID(ec) (((ec) & 0xff0000) >> 16) |
| -#define SYN_CAP_CLICKPAD(ex0c) ((ex0c) & 0x100100) |
| +#define SYN_CAP_CLICKPAD(ex0c) ((ex0c) & 0x100000) /* 1-button ClickPad */ |
| +#define SYN_CAP_CLICKPAD2BTN(ex0c) ((ex0c) & 0x000100) /* 2-button ClickPad */ |
| #define SYN_CAP_MAX_DIMENSIONS(ex0c) ((ex0c) & 0x020000) |
| |
| /* synaptics modes query bits */ |
