diff options
author | David P <megver83@parabola.nu> | 2020-01-11 13:22:21 -0300 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2020-01-11 13:22:21 -0300 |
commit | 2c87d2ba306bf99437baa65a76eb3011f88f8808 (patch) | |
tree | 08d91d426a1db282609b934967814afa23c68485 /kernels/linux-libre-xtreme/0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-o.patch | |
parent | 94ee3246674f4c0d3af735fbd3f045db0c0dd6d8 (diff) | |
download | abslibre-2c87d2ba306bf99437baa65a76eb3011f88f8808.tar.gz abslibre-2c87d2ba306bf99437baa65a76eb3011f88f8808.tar.bz2 abslibre-2c87d2ba306bf99437baa65a76eb3011f88f8808.zip |
updpkg: kernels/linux-libre-xtreme 5.4.10-1
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'kernels/linux-libre-xtreme/0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-o.patch')
-rw-r--r-- | kernels/linux-libre-xtreme/0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-o.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/kernels/linux-libre-xtreme/0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-o.patch b/kernels/linux-libre-xtreme/0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-o.patch deleted file mode 100644 index aaefa37bb..000000000 --- a/kernels/linux-libre-xtreme/0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-o.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 0bee55974a73eed4a9b9c9e87000df34117e7f69 Mon Sep 17 00:00:00 2001 -From: Dan Elkouby <streetwalkermc@gmail.com> -Date: Fri, 6 Sep 2019 14:06:44 +0300 -Subject: [PATCH 2/2] Bluetooth: hidp: Fix assumptions on the return value of - hidp_send_message - -hidp_send_message was changed to return non-zero values on success, -which some other bits did not expect. This caused spurious errors to be -propagated through the stack, breaking some drivers, such as hid-sony -for the Dualshock 4 in Bluetooth mode. - -As pointed out by Dan Carpenter, hid-microsoft directly relied on that -assumption as well. - -Fixes: 48d9cc9d85dd ("Bluetooth: hidp: Let hidp_send_message return number of queued bytes") - -Signed-off-by: Dan Elkouby <streetwalkermc@gmail.com> -Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> -Reviewed-by: Jiri Kosina <jkosina@suse.cz> -Signed-off-by: Marcel Holtmann <marcel@holtmann.org> ---- - drivers/hid/hid-microsoft.c | 2 +- - net/bluetooth/hidp/core.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c -index 8b3a922bdad3..2cf83856f2e4 100644 ---- a/drivers/hid/hid-microsoft.c -+++ b/drivers/hid/hid-microsoft.c -@@ -303,7 +303,7 @@ static void ms_ff_worker(struct work_struct *work) - r->magnitude[MAGNITUDE_WEAK] = ms->weak; /* right actuator */ - - ret = hid_hw_output_report(hdev, (__u8 *)r, sizeof(*r)); -- if (ret) -+ if (ret < 0) - hid_warn(hdev, "failed to send FF report\n"); - } - -diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c -index 8d889969ae7e..bef84b95e2c4 100644 ---- a/net/bluetooth/hidp/core.c -+++ b/net/bluetooth/hidp/core.c -@@ -267,7 +267,7 @@ static int hidp_get_raw_report(struct hid_device *hid, - set_bit(HIDP_WAITING_FOR_RETURN, &session->flags); - data[0] = report_number; - ret = hidp_send_ctrl_message(session, report_type, data, 1); -- if (ret) -+ if (ret < 0) - goto err; - - /* Wait for the return of the report. The returned report -@@ -343,7 +343,7 @@ static int hidp_set_raw_report(struct hid_device *hid, unsigned char reportnum, - data[0] = reportnum; - set_bit(HIDP_WAITING_FOR_SEND_ACK, &session->flags); - ret = hidp_send_ctrl_message(session, report_type, data, count); -- if (ret) -+ if (ret < 0) - goto err; - - /* Wait for the ACK from the device. */ --- -2.23.0 - |