diff options
author | Ping Cheng <pinglinux@gmail.com> | 2014-09-10 15:41:04 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2014-09-11 04:24:13 -0400 |
commit | c64d883476812783e0400d37028756151d103e5c (patch) | |
tree | 3ce3d375f09f80bebe1c62702d8f4d42e17cce0a | |
parent | 37449adc582441f5ff1bbd95e6a8357073fae86b (diff) |
HID: wacom - remove report_id from wacom_get_report interface
It is assigned in buf[0] anyway.
Signed-off-by: Ping Cheng <pingc@wacom.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/hid/wacom_sys.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 0a04c9a3e5b7..c6970e6283b4 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c | |||
@@ -26,13 +26,13 @@ | |||
26 | #define DEV_ATTR_RW_PERM (S_IRUGO | S_IWUSR | S_IWGRP) | 26 | #define DEV_ATTR_RW_PERM (S_IRUGO | S_IWUSR | S_IWGRP) |
27 | #define DEV_ATTR_WO_PERM (S_IWUSR | S_IWGRP) | 27 | #define DEV_ATTR_WO_PERM (S_IWUSR | S_IWGRP) |
28 | 28 | ||
29 | static int wacom_get_report(struct hid_device *hdev, u8 type, u8 id, | 29 | static int wacom_get_report(struct hid_device *hdev, u8 type, u8 *buf, |
30 | void *buf, size_t size, unsigned int retries) | 30 | size_t size, unsigned int retries) |
31 | { | 31 | { |
32 | int retval; | 32 | int retval; |
33 | 33 | ||
34 | do { | 34 | do { |
35 | retval = hid_hw_raw_request(hdev, id, buf, size, type, | 35 | retval = hid_hw_raw_request(hdev, buf[0], buf, size, type, |
36 | HID_REQ_GET_REPORT); | 36 | HID_REQ_GET_REPORT); |
37 | } while ((retval == -ETIMEDOUT || retval == -EPIPE) && --retries); | 37 | } while ((retval == -ETIMEDOUT || retval == -EPIPE) && --retries); |
38 | 38 | ||
@@ -258,7 +258,7 @@ static int wacom_set_device_mode(struct hid_device *hdev, int report_id, | |||
258 | length, 1); | 258 | length, 1); |
259 | if (error >= 0) | 259 | if (error >= 0) |
260 | error = wacom_get_report(hdev, HID_FEATURE_REPORT, | 260 | error = wacom_get_report(hdev, HID_FEATURE_REPORT, |
261 | report_id, rep_data, length, 1); | 261 | rep_data, length, 1); |
262 | } while ((error < 0 || rep_data[1] != mode) && limit++ < WAC_MSG_RETRIES); | 262 | } while ((error < 0 || rep_data[1] != mode) && limit++ < WAC_MSG_RETRIES); |
263 | 263 | ||
264 | kfree(rep_data); | 264 | kfree(rep_data); |