diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-02-17 14:07:35 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-02-17 14:07:35 +0100 |
| commit | 3371ac4b3b8b7d56928949ba7cfa6fc6274445e9 (patch) | |
| tree | f7cd1dbb974d5ac7fc8af611dc6522a76b68b4cf /drivers/hid/hid-sony.c | |
| parent | 7db7504a49b378529793ca9d331318567c496cfe (diff) | |
| parent | 6fad42d5fb42ffcf665634591ad4d9531536eb44 (diff) | |
| download | op-kernel-dev-3371ac4b3b8b7d56928949ba7cfa6fc6274445e9.zip op-kernel-dev-3371ac4b3b8b7d56928949ba7cfa6fc6274445e9.tar.gz | |
Merge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-3.15/sony
Diffstat (limited to 'drivers/hid/hid-sony.c')
| -rw-r--r-- | drivers/hid/hid-sony.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index be0d386..e6995bf 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -810,7 +810,8 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev) if (!buf) return -ENOMEM; - ret = hdev->hid_get_raw_report(hdev, 0xf2, buf, 17, HID_FEATURE_REPORT); + ret = hid_hw_raw_request(hdev, 0xf2, buf, 17, HID_FEATURE_REPORT, + HID_REQ_GET_REPORT); if (ret < 0) hid_err(hdev, "can't set operational mode\n"); @@ -823,7 +824,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 hdev->hid_output_raw_report(hdev, buf, sizeof(buf), HID_FEATURE_REPORT); + return hid_output_raw_report(hdev, buf, sizeof(buf), + HID_FEATURE_REPORT); } static void buzz_set_leds(struct hid_device *hdev, const __u8 *leds) @@ -1042,8 +1044,7 @@ static void sixaxis_state_worker(struct work_struct *work) buf[10] |= sc->led_state[2] << 3; buf[10] |= sc->led_state[3] << 4; - sc->hdev->hid_output_raw_report(sc->hdev, buf, sizeof(buf), - HID_OUTPUT_REPORT); + hid_output_raw_report(sc->hdev, buf, sizeof(buf), HID_OUTPUT_REPORT); } static void dualshock4_state_worker(struct work_struct *work) |
