diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-04-01 19:05:09 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-04-01 19:05:09 +0200 |
| commit | ad295b6d5739ab24880a31be403bbc8fab62e177 (patch) | |
| tree | cd760a18bcfa6e59b8b63fc71e333ba394b1cd9c /drivers/hid/hid-thingm.c | |
| parent | ba04a57b4acd05a764471b2accd02000f6641881 (diff) | |
| parent | c3d77fab51f40821de91a744e4b514e9e4e76a7c (diff) | |
Merge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-linus
Conflicts:
drivers/hid/hid-ids.h
drivers/hid/hid-sony.c
drivers/hid/i2c-hid/i2c-hid.c
Diffstat (limited to 'drivers/hid/hid-thingm.c')
| -rw-r--r-- | drivers/hid/hid-thingm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-thingm.c b/drivers/hid/hid-thingm.c index 99342cfa0ea2..a97c78845f7b 100644 --- a/drivers/hid/hid-thingm.c +++ b/drivers/hid/hid-thingm.c @@ -48,8 +48,8 @@ static int blink1_send_command(struct blink1_data *data, buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7], buf[8]); - ret = data->hdev->hid_output_raw_report(data->hdev, buf, - BLINK1_CMD_SIZE, HID_FEATURE_REPORT); + ret = hid_hw_raw_request(data->hdev, buf[0], buf, BLINK1_CMD_SIZE, + HID_FEATURE_REPORT, HID_REQ_SET_REPORT); return ret < 0 ? ret : 0; } |