47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
From b2d8dd6455350d10e35533fe209e7c11170f8deb Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
|
Date: Mon, 20 Dec 2021 10:51:20 +0100
|
|
Subject: [PATCH] HID: holtek: fix mouse probing
|
|
|
|
An overlook from the previous commit: we don't even parse or start the
|
|
device, meaning that the device is not presented to user space.
|
|
|
|
Fixes: 93020953d0fa ("HID: check for valid USB device for many HID drivers")
|
|
Cc: stable@vger.kernel.org
|
|
Link: https://bugs.archlinux.org/task/73048
|
|
Link: https://bugzilla.kernel.org/show_bug.cgi?id=215341
|
|
Link: https://lore.kernel.org/r/e4efbf13-bd8d-0370-629b-6c80c0044b15@leemhuis.info/
|
|
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
|
For: https://bugs.archlinux.org/task/73048
|
|
---
|
|
drivers/hid/hid-holtek-mouse.c | 15 +++++++++++++++
|
|
1 file changed, 15 insertions(+)
|
|
|
|
diff --git a/drivers/hid/hid-holtek-mouse.c b/drivers/hid/hid-holtek-mouse.c
|
|
index b7172c48ef9f08..7c907939bfae1d 100644
|
|
--- a/drivers/hid/hid-holtek-mouse.c
|
|
+++ b/drivers/hid/hid-holtek-mouse.c
|
|
@@ -65,8 +65,23 @@ static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc,
|
|
static int holtek_mouse_probe(struct hid_device *hdev,
|
|
const struct hid_device_id *id)
|
|
{
|
|
+ int ret;
|
|
+
|
|
if (!hid_is_usb(hdev))
|
|
return -EINVAL;
|
|
+
|
|
+ ret = hid_parse(hdev);
|
|
+ if (ret) {
|
|
+ hid_err(hdev, "hid parse failed: %d\n", ret);
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
+ ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
|
|
+ if (ret) {
|
|
+ hid_err(hdev, "hw start failed: %d\n", ret);
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
return 0;
|
|
}
|
|
|