diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/input/tablet/wacom_sys.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index fc6fd53c1af1..1e3af299a1c2 100644 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c | |||
@@ -319,8 +319,9 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat | |||
319 | if (!rep_data) | 319 | if (!rep_data) |
320 | return error; | 320 | return error; |
321 | 321 | ||
322 | /* ask to report tablet data if it is 2FGT or not a Tablet PC */ | 322 | /* ask to report tablet data if it is 2FGT Tablet PC or |
323 | if (features->device_type == BTN_TOOL_TRIPLETAP) { | 323 | * not a Tablet PC */ |
324 | if (features->type == TABLETPC2FG) { | ||
324 | do { | 325 | do { |
325 | rep_data[0] = 3; | 326 | rep_data[0] = 3; |
326 | rep_data[1] = 4; | 327 | rep_data[1] = 4; |
@@ -332,7 +333,7 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat | |||
332 | WAC_HID_FEATURE_REPORT, report_id, | 333 | WAC_HID_FEATURE_REPORT, report_id, |
333 | rep_data, 3); | 334 | rep_data, 3); |
334 | } while ((error < 0 || rep_data[1] != 4) && limit++ < 5); | 335 | } while ((error < 0 || rep_data[1] != 4) && limit++ < 5); |
335 | } else if (features->type != TABLETPC && features->type != TABLETPC2FG) { | 336 | } else if (features->type != TABLETPC) { |
336 | do { | 337 | do { |
337 | rep_data[0] = 2; | 338 | rep_data[0] = 2; |
338 | rep_data[1] = 2; | 339 | rep_data[1] = 2; |
@@ -364,7 +365,7 @@ static int wacom_retrieve_hid_descriptor(struct usb_interface *intf, | |||
364 | features->pressure_fuzz = 0; | 365 | features->pressure_fuzz = 0; |
365 | features->distance_fuzz = 0; | 366 | features->distance_fuzz = 0; |
366 | 367 | ||
367 | /* only Tablet PCs need to retrieve the info */ | 368 | /* only Tablet PCs and Bamboo P&T need to retrieve the info */ |
368 | if ((features->type != TABLETPC) && (features->type != TABLETPC2FG) && | 369 | if ((features->type != TABLETPC) && (features->type != TABLETPC2FG) && |
369 | (features->type != BAMBOO_PT)) | 370 | (features->type != BAMBOO_PT)) |
370 | goto out; | 371 | goto out; |