summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2019-08-15 12:18:58 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2019-08-15 12:18:58 -0400
commitd2c7d603bbc73eeba21666b8a1d5b040b3b21e6b (patch)
treed497c41b148f20e9d46de88556479c2d2eec065a
parentb814f7aba9c7d17236a9cc8402cf092264bbb12b (diff)
downloadlongterm-queue-4.18-d2c7d603bbc73eeba21666b8a1d5b040b3b21e6b.tar.gz
hid: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/HID-logitech-hidpp-use-RAP-instead-of-FAP-to-get-the.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/queue/HID-logitech-hidpp-use-RAP-instead-of-FAP-to-get-the.patch b/queue/HID-logitech-hidpp-use-RAP-instead-of-FAP-to-get-the.patch
index dffa52f..c1941a0 100644
--- a/queue/HID-logitech-hidpp-use-RAP-instead-of-FAP-to-get-the.patch
+++ b/queue/HID-logitech-hidpp-use-RAP-instead-of-FAP-to-get-the.patch
@@ -1,4 +1,4 @@
-From 096377525cdb8251e4656085efc988bdf733fb4c Mon Sep 17 00:00:00 2001
+From 20f2155c7c1f2ecb3b200d5b22b47ba48b53da53 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sat, 20 Apr 2019 13:22:10 +0200
Subject: [PATCH] HID: logitech-hidpp: use RAP instead of FAP to get the
@@ -29,10 +29,10 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
-index b0da186ef5e7..243426097c51 100644
+index 8425d3548a41..edf224ad1336 100644
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
-@@ -837,13 +837,16 @@ static int hidpp_root_get_feature(struct hidpp_device *hidpp, u16 feature,
+@@ -725,13 +725,16 @@ static int hidpp_root_get_feature(struct hidpp_device *hidpp, u16 feature,
static int hidpp_root_get_protocol_version(struct hidpp_device *hidpp)
{
@@ -51,7 +51,7 @@ index b0da186ef5e7..243426097c51 100644
if (ret == HIDPP_ERROR_INVALID_SUBID) {
hidpp->protocol_major = 1;
-@@ -863,8 +866,14 @@ static int hidpp_root_get_protocol_version(struct hidpp_device *hidpp)
+@@ -751,8 +754,14 @@ static int hidpp_root_get_protocol_version(struct hidpp_device *hidpp)
if (ret)
return ret;
@@ -66,8 +66,8 @@ index b0da186ef5e7..243426097c51 100644
+ hidpp->protocol_major = response.rap.params[0];
+ hidpp->protocol_minor = response.rap.params[1];
- print_version:
- hid_info(hidpp->hid_dev, "HID++ %u.%u device connected.\n",
+ return ret;
+ }
--
2.7.4