diff options
Diffstat (limited to 'drivers/input/tablet/wacom_wac.c')
| -rw-r--r-- | drivers/input/tablet/wacom_wac.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 7fefd93596ea..d1ced325939d 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c | |||
| @@ -842,12 +842,7 @@ static int wacom_bpt_pen(struct wacom_wac *wacom) | |||
| 842 | unsigned char *data = wacom->data; | 842 | unsigned char *data = wacom->data; |
| 843 | int prox = 0, x = 0, y = 0, p = 0, d = 0, pen = 0, btn1 = 0, btn2 = 0; | 843 | int prox = 0, x = 0, y = 0, p = 0, d = 0, pen = 0, btn1 = 0, btn2 = 0; |
| 844 | 844 | ||
| 845 | /* | 845 | prox = (data[1] & 0x20) == 0x20; |
| 846 | * Similar to Graphire protocol, data[1] & 0x20 is proximity and | ||
| 847 | * data[1] & 0x18 is tool ID. 0x30 is safety check to ignore | ||
| 848 | * 2 unused tool ID's. | ||
| 849 | */ | ||
| 850 | prox = (data[1] & 0x30) == 0x30; | ||
| 851 | 846 | ||
| 852 | /* | 847 | /* |
| 853 | * All reports shared between PEN and RUBBER tool must be | 848 | * All reports shared between PEN and RUBBER tool must be |