| From 8b4073596997f2ccbf68d8e72e07b827388a4536 Mon Sep 17 00:00:00 2001 |
| From: Aaron Armstrong Skomra <skomra@gmail.com> |
| Date: Wed, 29 Mar 2017 10:35:39 -0700 |
| Subject: [PATCH] HID: wacom: Don't add ghost interface as shared data |
| |
| commit 8b4073596997f2ccbf68d8e72e07b827388a4536 upstream. |
| |
| A previous commit (below) adds a check for already probed interfaces to |
| Wacom's matching heuristic. Unfortunately this causes the Bamboo Pen |
| (CTL-460) to match itself to its 'ghost' touch interface. After |
| subsequent changes to the driver this match to the ghost causes the |
| kernel to crash. This patch avoids calling wacom_add_shared_data() |
| for the BAMBOO_PEN's ghost touch interface. |
| |
| Fixes: 41372d5d40e7 ("HID: wacom: Augment 'oVid' and 'oPid' with heuristics for HID_GENERIC") |
| Cc: stable <stable@vger.kernel.org> # 4.9 |
| Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| |
| diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c |
| index 994bddc55b82..b676f02d4b7f 100644 |
| --- a/drivers/hid/wacom_sys.c |
| +++ b/drivers/hid/wacom_sys.c |
| @@ -2165,6 +2165,14 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless) |
| |
| wacom_update_name(wacom, wireless ? " (WL)" : ""); |
| |
| + /* pen only Bamboo neither support touch nor pad */ |
| + if ((features->type == BAMBOO_PEN) && |
| + ((features->device_type & WACOM_DEVICETYPE_TOUCH) || |
| + (features->device_type & WACOM_DEVICETYPE_PAD))) { |
| + error = -ENODEV; |
| + goto fail; |
| + } |
| + |
| error = wacom_add_shared_data(hdev); |
| if (error) |
| goto fail; |
| @@ -2212,14 +2220,6 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless) |
| goto fail_quirks; |
| } |
| |
| - /* pen only Bamboo neither support touch nor pad */ |
| - if ((features->type == BAMBOO_PEN) && |
| - ((features->device_type & WACOM_DEVICETYPE_TOUCH) || |
| - (features->device_type & WACOM_DEVICETYPE_PAD))) { |
| - error = -ENODEV; |
| - goto fail_quirks; |
| - } |
| - |
| if (features->device_type & WACOM_DEVICETYPE_WL_MONITOR) |
| error = hid_hw_open(hdev); |
| |
| -- |
| 2.12.0 |
| |