Linux v5.2-rc6-93-g556e2f6020bf

This commit is contained in:
Justin M. Forbes 2019-06-28 09:20:53 -05:00
parent 6cb99dafc0
commit 7addfa8f74
4 changed files with 6 additions and 52 deletions

View File

@ -1,46 +0,0 @@
From 3b6df7e8130719b6bd83be241eb455f2aa862e9f Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 14 Jun 2019 09:28:32 +0200
Subject: [PATCH] HID: logitech-dj: Fix forwarding of very long HID++ reports
The HID++ spec also defines very long HID++ reports, with a reportid of
0x12. The MX5000 and MX5500 keyboards use 0x12 output reports for sending
messages to display on their buildin LCD.
Userspace (libmx5000) supports this, in order for this to work when talking
to the HID devices instantiated for the keyboard by hid-logitech-dj,
we need to properly forward these reports to the device.
This commit fixes logi_dj_ll_raw_request not forwarding these reports.
Fixes: f2113c3020ef ("HID: logitech-dj: add support for Logitech Bluetooth Mini-Receiver")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/hid/hid-logitech-dj.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
index 865b179d0a62..aedbe18182db 100644
--- a/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@ -30,6 +30,7 @@
#define REPORT_ID_HIDPP_SHORT 0x10
#define REPORT_ID_HIDPP_LONG 0x11
+#define REPORT_ID_HIDPP_VERY_LONG 0x12
#define HIDPP_REPORT_SHORT_LENGTH 7
#define HIDPP_REPORT_LONG_LENGTH 20
@@ -1242,7 +1243,8 @@ static int logi_dj_ll_raw_request(struct hid_device *hid,
int ret;
if ((buf[0] == REPORT_ID_HIDPP_SHORT) ||
- (buf[0] == REPORT_ID_HIDPP_LONG)) {
+ (buf[0] == REPORT_ID_HIDPP_LONG) ||
+ (buf[0] == REPORT_ID_HIDPP_VERY_LONG)) {
if (count < 2)
return -EINVAL;
--
2.21.0

2
gitrev
View File

@ -1 +1 @@
249155c20f9b0754bc1b932a33344cfb4e0c2101
556e2f6020bf90f63c5dd65e9a2254be6db3185b

View File

@ -71,7 +71,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 6
# The git snapshot level
%define gitrev 1
%define gitrev 2
# Set rpm version accordingly
%define rpmversion 5.%{upstream_sublevel}.0
%endif
@ -591,9 +591,6 @@ Patch527: v2-powerpc-mm-mark-more-tlb-functions-as-__always_inline.patch
Patch530: crypto-ghash-fix-unaligned-memory-access-in-ghash_setkey.patch
# Fix for new Logitech wireless keyboard support in 5.2, submitted upstream
Patch534: 0001-HID-logitech-dj-Fix-forwarding-of-very-long-HID-repo.patch
# END OF PATCH DEFINITIONS
%endif
@ -1832,6 +1829,9 @@ fi
#
#
%changelog
* Fri Jun 28 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc6.git2.1
- Linux v5.2-rc6-93-g556e2f6020bf
* Tue Jun 25 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc6.git1.1
- Linux v5.2-rc6-15-g249155c20f9b
- Reenable debugging options.

View File

@ -1,3 +1,3 @@
SHA512 (linux-5.1.tar.xz) = ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
SHA512 (patch-5.2-rc6.xz) = 61b4c645477810a417fff019fa4c92f58a7914945d653b3c3eba67b467680eea6aea42895d63fc37af4b25dd0c9f30c73778ec02a8e16d1dfa3b38ee5eec7554
SHA512 (patch-5.2-rc6-git1.xz) = 4bde9f3a996b6548a5fa0cb4041331b9386c85128b7900dcdab7f19c633e419e1d2c5f7615bf5d840cf10e42cb9f5efc689a2061e800b171932390419ac3343a
SHA512 (patch-5.2-rc6-git2.xz) = 2263e2c0d351a75c8924e34e6984161d74549b4260c59b33def450dac5720588ff3329e49429aeb44452f3a50d22065692750943706d3b04f5b9a1801e0b39f4