diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-08 03:07:48 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-08 03:07:48 +0400 |
| commit | 3c3416abbe3328c2fae054379894614b0c894069 (patch) | |
| tree | 679a21e7b4b56124879248e0455a95a42fa80355 /drivers/input/tablet/wacom_sys.c | |
| parent | 333fbe8409dfabd3d3581af5cdbd30f666857437 (diff) | |
| parent | 9b7e31bbf4bb58b12e11a7f24b7c3e48bbd2f4da (diff) | |
| download | linux-3c3416abbe3328c2fae054379894614b0c894069.tar.xz | |
Merge branch 'for-linus' to bring in change ensuring that drivers that
use threaded IRQs use IRQF_ONESHOT.
Diffstat (limited to 'drivers/input/tablet/wacom_sys.c')
| -rw-r--r-- | drivers/input/tablet/wacom_sys.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index 9a854e2d15dc..0d3219f29744 100644 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c @@ -216,7 +216,7 @@ static void wacom_retrieve_report_data(struct usb_interface *intf, rep_data[0] = 12; result = wacom_get_report(intf, WAC_HID_FEATURE_REPORT, - rep_data[0], &rep_data, 2, + rep_data[0], rep_data, 2, WAC_MSG_RETRIES); if (result >= 0 && rep_data[1] > 2) @@ -401,7 +401,9 @@ static int wacom_parse_hid(struct usb_interface *intf, break; case HID_USAGE_CONTACTMAX: - wacom_retrieve_report_data(intf, features); + /* leave touch_max as is if predefined */ + if (!features->touch_max) + wacom_retrieve_report_data(intf, features); i++; break; } |