diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-12-23 15:25:50 -0800 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-12-23 15:25:50 -0800 |
| commit | 50c51225e394b46a10a8c3bca88dc8b2be1d9fc7 (patch) | |
| tree | 7d413fd5b1fdf1d2cac7cf01201235a9a13fb631 | |
| parent | Updated to 5.15.10 (diff) | |
| download | linux-50c51225e394b46a10a8c3bca88dc8b2be1d9fc7.tar.xz | |
Updated to 5.15.11
| -rw-r--r-- | 0007-HID-holtek-fix-mouse-probing.patch | 50 | ||||
| -rw-r--r-- | PKGBUILD | 7 |
2 files changed, 55 insertions, 2 deletions
diff --git a/0007-HID-holtek-fix-mouse-probing.patch b/0007-HID-holtek-fix-mouse-probing.patch new file mode 100644 index 0000000..465f338 --- /dev/null +++ b/0007-HID-holtek-fix-mouse-probing.patch @@ -0,0 +1,50 @@ +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 7/8] 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 b7172c48ef9f..7c907939bfae 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; + } + +-- +2.34.1 + @@ -18,7 +18,7 @@ _custom=0 pkgbase=linux _supver=5 _majver=15 -_minver=10 +_minver=11 _gccpatchver='20211114' _gccpatchker='5.15+' if [ "$_minver" == "0" ]; then @@ -47,6 +47,7 @@ source=( 0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch 0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch 0006-lg-laptop-Recognize-more-models.patch + 0007-HID-holtek-fix-mouse-probing.patch kernel_compiler_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/${_gccpatchver}.tar.gz ath9k-regdom-hack.patch raid6-default-algo.patch @@ -56,7 +57,7 @@ validpgpkeys=( '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -b2sums=('a21e5a965c0a4fe2e014961a6cc8f4c621fd9313a4b170f97fd3f77ae2494e721bf579e68d5836c167ed9fb6674784b20722501f6adc44d634073e74a82da765' +b2sums=('37a264e50069e5b195b99a355944893e42c6fc05eb5fef7907855de4d31c693421e6fc578575ed141534b52ab9105dfd7697bdfec238cfa88e16a6c41f138ebd' 'SKIP' '09d50bc9eb434323bdc432b7c1e82d66b702f58b27f318841936c67c8b54f8df64023a90d488ff1f9d2bf0cb3b6e673eecc3c6ebd49a6ee7d73ae6684eb1b801' 'f1e7205c4033abe680c5ddc9542a677f27b725f2d8b9b84133d877b1d60d5c373ed2873445202bdd7e15b6f56c96ffa2427fc1e36b485c25ae69907f486c4603' @@ -65,6 +66,7 @@ b2sums=('a21e5a965c0a4fe2e014961a6cc8f4c621fd9313a4b170f97fd3f77ae2494e721bf579e '087676835d15d3c13da86a37e2de922a461b973931ecf29f1ddefddfa23df3ea045799db1f62aa3be70d57df4436ae5fe4f2ef99c05258a1aa9944c00724cdc5' 'b693e06413968585a18b1d504768433420588764485eee298b70d5ca622197d7d134bf42d4f517b0f8367a188f90580825d1c3f8a55099ec69fc14be66465f16' 'ac8502cd579880d05108aad23b844633a67ff9d8b83b63d2a0fc7fa1031aa3b09ee52989415cc27a0ef13f8a9e3f035bf27b33ed1dafc5132c4edc371800c061' + '41ea8f78dff2ab66aa576fcb8c3ae4f1ce8c7a9a5f9c0c77993572dba040000a0755ef61f073c79610a33e609fa30402ee5726a7f46f58d26b9aba29595114f6' '534091fb5034226d48f18da2114305860e67ee49a1d726b049a240ce61df83e840a9a255e5b8fa9279ec07dd69fb0aea6e2e48962792c2b5367db577a4423d8d' 'b6ef77035611139fa9a6d5b8d30570e2781bb4da483bb569884b0bd0129b62e0b82a5a6776fefe43fee801c70d39de1ea4d4c177f7cedd5ac135e3c64f7b895a' 'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a') @@ -92,6 +94,7 @@ prepare() { patch -p1 -i ../0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch patch -p1 -i ../0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch patch -p1 -i ../0006-lg-laptop-Recognize-more-models.patch + patch -p1 -i ../0007-HID-holtek-fix-mouse-probing.patch # graysky gcc patch |