From 03dd4cb26d967f9588437b0fc9cc0e8353322bb7 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 25 Mar 2016 03:53:42 -0300 Subject: Linux-libre 4.5-gnu --- net/bluetooth/hidp/core.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'net/bluetooth/hidp') diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index f2d3dcda3..0bec4588c 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c @@ -378,16 +378,9 @@ static int hidp_output_report(struct hid_device *hid, __u8 *data, size_t count) { struct hidp_session *session = hid->driver_data; - /* The Sixaxis and Dualshock 4 wants report sent via the ctrl channel */ - if(hid->vendor == 0x54c && (hid->product == 0x5c4 || hid->product == 0x268)) { - return hidp_send_ctrl_message(session, - HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_OUPUT, - data, count); - } else { - return hidp_send_intr_message(session, - HIDP_TRANS_DATA | HIDP_DATA_RTYPE_OUPUT, - data, count); - } + return hidp_send_intr_message(session, + HIDP_TRANS_DATA | HIDP_DATA_RTYPE_OUPUT, + data, count); } static int hidp_raw_request(struct hid_device *hid, unsigned char reportnum, -- cgit v1.2.3-54-g00ecf