diff options
Diffstat (limited to 'drivers/input/tablet/wacom_sys.c')
| -rw-r--r-- | drivers/input/tablet/wacom_sys.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index fc381498b798..b97665f9765e 100644 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c | |||
| @@ -193,16 +193,16 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi | |||
| 193 | case HID_USAGE_X: | 193 | case HID_USAGE_X: |
| 194 | if (usage == WCM_DESKTOP) { | 194 | if (usage == WCM_DESKTOP) { |
| 195 | if (finger) { | 195 | if (finger) { |
| 196 | features->device_type = BTN_TOOL_DOUBLETAP; | 196 | features->device_type = BTN_TOOL_FINGER; |
| 197 | if (features->type == TABLETPC2FG) { | 197 | if (features->type == TABLETPC2FG) { |
| 198 | /* need to reset back */ | 198 | /* need to reset back */ |
| 199 | features->pktlen = WACOM_PKGLEN_TPC2FG; | 199 | features->pktlen = WACOM_PKGLEN_TPC2FG; |
| 200 | features->device_type = BTN_TOOL_TRIPLETAP; | 200 | features->device_type = BTN_TOOL_DOUBLETAP; |
| 201 | } | 201 | } |
| 202 | if (features->type == BAMBOO_PT) { | 202 | if (features->type == BAMBOO_PT) { |
| 203 | /* need to reset back */ | 203 | /* need to reset back */ |
| 204 | features->pktlen = WACOM_PKGLEN_BBTOUCH; | 204 | features->pktlen = WACOM_PKGLEN_BBTOUCH; |
| 205 | features->device_type = BTN_TOOL_TRIPLETAP; | 205 | features->device_type = BTN_TOOL_DOUBLETAP; |
| 206 | features->x_phy = | 206 | features->x_phy = |
| 207 | get_unaligned_le16(&report[i + 5]); | 207 | get_unaligned_le16(&report[i + 5]); |
| 208 | features->x_max = | 208 | features->x_max = |
| @@ -241,11 +241,11 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi | |||
| 241 | case HID_USAGE_Y: | 241 | case HID_USAGE_Y: |
| 242 | if (usage == WCM_DESKTOP) { | 242 | if (usage == WCM_DESKTOP) { |
| 243 | if (finger) { | 243 | if (finger) { |
| 244 | features->device_type = BTN_TOOL_DOUBLETAP; | 244 | features->device_type = BTN_TOOL_FINGER; |
| 245 | if (features->type == TABLETPC2FG) { | 245 | if (features->type == TABLETPC2FG) { |
| 246 | /* need to reset back */ | 246 | /* need to reset back */ |
| 247 | features->pktlen = WACOM_PKGLEN_TPC2FG; | 247 | features->pktlen = WACOM_PKGLEN_TPC2FG; |
| 248 | features->device_type = BTN_TOOL_TRIPLETAP; | 248 | features->device_type = BTN_TOOL_DOUBLETAP; |
| 249 | features->y_max = | 249 | features->y_max = |
| 250 | get_unaligned_le16(&report[i + 3]); | 250 | get_unaligned_le16(&report[i + 3]); |
| 251 | features->y_phy = | 251 | features->y_phy = |
| @@ -254,7 +254,7 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi | |||
| 254 | } else if (features->type == BAMBOO_PT) { | 254 | } else if (features->type == BAMBOO_PT) { |
| 255 | /* need to reset back */ | 255 | /* need to reset back */ |
| 256 | features->pktlen = WACOM_PKGLEN_BBTOUCH; | 256 | features->pktlen = WACOM_PKGLEN_BBTOUCH; |
| 257 | features->device_type = BTN_TOOL_TRIPLETAP; | 257 | features->device_type = BTN_TOOL_DOUBLETAP; |
| 258 | features->y_phy = | 258 | features->y_phy = |
| 259 | get_unaligned_le16(&report[i + 3]); | 259 | get_unaligned_le16(&report[i + 3]); |
| 260 | features->y_max = | 260 | features->y_max = |