| From 3064a03b94e60388f0955fcc29f3e8a978d28f75 Mon Sep 17 00:00:00 2001 |
| From: Aaron Ma <aaron.ma@canonical.com> |
| Date: Sat, 3 Feb 2018 23:57:15 +0800 |
| Subject: HID: Fix hid_report_len usage |
| |
| From: Aaron Ma <aaron.ma@canonical.com> |
| |
| commit 3064a03b94e60388f0955fcc29f3e8a978d28f75 upstream. |
| |
| Follow the change of return type u32 of hid_report_len, |
| fix all the types of variables those get the return value of |
| hid_report_len to u32, and all other code already uses u32. |
| |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Aaron Ma <aaron.ma@canonical.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/hid/hid-input.c | 3 ++- |
| drivers/hid/hid-multitouch.c | 5 +++-- |
| drivers/hid/hid-rmi.c | 4 ++-- |
| drivers/hid/wacom_sys.c | 2 +- |
| 4 files changed, 8 insertions(+), 6 deletions(-) |
| |
| --- a/drivers/hid/hid-input.c |
| +++ b/drivers/hid/hid-input.c |
| @@ -1279,7 +1279,8 @@ static void hidinput_led_worker(struct w |
| led_work); |
| struct hid_field *field; |
| struct hid_report *report; |
| - int len, ret; |
| + int ret; |
| + u32 len; |
| __u8 *buf; |
| |
| field = hidinput_get_led_field(hid); |
| --- a/drivers/hid/hid-multitouch.c |
| +++ b/drivers/hid/hid-multitouch.c |
| @@ -315,7 +315,8 @@ static struct attribute_group mt_attribu |
| static void mt_get_feature(struct hid_device *hdev, struct hid_report *report) |
| { |
| struct mt_device *td = hid_get_drvdata(hdev); |
| - int ret, size = hid_report_len(report); |
| + int ret; |
| + u32 size = hid_report_len(report); |
| u8 *buf; |
| |
| /* |
| @@ -919,7 +920,7 @@ static void mt_set_input_mode(struct hid |
| struct hid_report_enum *re; |
| struct mt_class *cls = &td->mtclass; |
| char *buf; |
| - int report_len; |
| + u32 report_len; |
| |
| if (td->inputmode < 0) |
| return; |
| --- a/drivers/hid/hid-rmi.c |
| +++ b/drivers/hid/hid-rmi.c |
| @@ -110,8 +110,8 @@ struct rmi_data { |
| u8 *writeReport; |
| u8 *readReport; |
| |
| - int input_report_size; |
| - int output_report_size; |
| + u32 input_report_size; |
| + u32 output_report_size; |
| |
| unsigned long flags; |
| |
| --- a/drivers/hid/wacom_sys.c |
| +++ b/drivers/hid/wacom_sys.c |
| @@ -351,7 +351,7 @@ static int wacom_set_device_mode(struct |
| u8 *rep_data; |
| struct hid_report *r; |
| struct hid_report_enum *re; |
| - int length; |
| + u32 length; |
| int error = -ENOMEM, limit = 0; |
| |
| if (wacom_wac->mode_report < 0) |