From 9ceeb061a7e5d21b9bc523bc85393033ade0e5d6 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Thu, 28 Nov 2019 00:36:04 -0800 Subject: Updated to 5.4 --- ...-on-the-return-value-of-hidp_send_message.patch | 62 ---------------------- 1 file changed, 62 deletions(-) delete mode 100644 0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-of-hidp_send_message.patch (limited to '0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-of-hidp_send_message.patch') diff --git a/0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-of-hidp_send_message.patch b/0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-of-hidp_send_message.patch deleted file mode 100644 index f2bceca..0000000 --- a/0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-of-hidp_send_message.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 0bee55974a73eed4a9b9c9e87000df34117e7f69 Mon Sep 17 00:00:00 2001 -From: Dan Elkouby -Date: Fri, 6 Sep 2019 14:06:44 +0300 -Subject: 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 -Reviewed-by: Dan Carpenter -Reviewed-by: Jiri Kosina -Signed-off-by: Marcel Holtmann ---- - 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. */ --- -cgit v1.2.1-1-g437b -- cgit v1.2.1