Merge branch 'for-3.15/sony' into for-3.15/hid-core-ll-transport-cleanup

[mirror_ubuntu-artful-kernel.git] / drivers / hid / hid-sony.c

diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index b1aa6f00c827574eee039a597a81b7f7a481d4b9..b5fe65e70dc4f19eb76d3b6039b52fe3bdbeb1fd 100644 (file)
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -1072,8 +1072,8 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev)
 static int sixaxis_set_operational_bt(struct hid_device *hdev)
 {
        unsigned char buf[] = { 0xf4,  0x42, 0x03, 0x00, 0x00 };
-       return hid_output_raw_report(hdev, buf, sizeof(buf),
-                                    HID_FEATURE_REPORT);
+       return hid_hw_raw_request(hdev, buf[0], buf, sizeof(buf),
+                                 HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
 }
 
 /*