Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1612180 > unrolled thread
| Started by | Aaron Armstrong Skomra <skomra@gmail.com> |
|---|---|
| First post | 2017-03-29 19:40 +0200 |
| Last post | 2017-03-30 11:40 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] HID: wacom: Don't add ghost interface as shared data Aaron Armstrong Skomra <skomra@gmail.com> - 2017-03-29 19:40 +0200
Re: [PATCH] HID: wacom: Don't add ghost interface as shared data Jiri Kosina <jikos@kernel.org> - 2017-03-30 11:40 +0200
| From | Aaron Armstrong Skomra <skomra@gmail.com> |
|---|---|
| Date | 2017-03-29 19:40 +0200 |
| Subject | [PATCH] HID: wacom: Don't add ghost interface as shared data |
| Message-ID | <tqpJE-1Fu-17@gated-at.bofh.it> |
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>
---
drivers/hid/wacom_sys.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 5e7a5648e708..0c535d0f3b95 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -2017,6 +2017,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;
@@ -2064,14 +2072,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.7.4
[toc] | [next] | [standalone]
| From | Jiri Kosina <jikos@kernel.org> |
|---|---|
| Date | 2017-03-30 11:40 +0200 |
| Message-ID | <tqEIF-4h2-17@gated-at.bofh.it> |
| In reply to | #1612180 |
On Wed, 29 Mar 2017, Aaron Armstrong Skomra wrote:
> 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>
Applied to for-4.11/upstream-fixes.
--
Jiri Kosina
SUSE Labs
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web