Commit 48d9cc9d85dd ("Bluetooth: hidp: Let hidp_send_message return
number of queued bytes") changed hidp_send_message 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 (all?)
drivers, such as hid-sony for the Dualshock 4 in Bluetooth mode.

Signed-off-by: Dan Elkouby <[email protected]>
---
 net/bluetooth/hidp/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

Reply via email to