4 files changed, 9 insertions, 7 deletions

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 04d01b57d94c..d86398755b0d 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -1368,7 +1368,8 @@ static void hidinput_led_worker(struct work_struct *work)
                                               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);
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 3b4739bde05d..2e1736ba2444 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -370,7 +370,8 @@ static const struct attribute_group mt_attribute_group = {
 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;
 
         /*
@@ -1183,7 +1184,7 @@ static void mt_set_input_mode(struct hid_device *hdev)
         struct hid_report_enum *re;
         struct mt_class *cls = &td->mtclass;
         char *buf;
-        int report_len;
+        u32 report_len;
 
         if (td->inputmode < 0)
                 return;
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
index c6c05df3e8d2..9c9362149641 100644
--- a/drivers/hid/hid-rmi.c
+++ b/drivers/hid/hid-rmi.c
@@ -89,8 +89,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;
 
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 409543160af7..b54ef1ffcbec 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -219,7 +219,7 @@ static void wacom_feature_mapping(struct hid_device *hdev,
         unsigned int equivalent_usage = wacom_equivalent_usage(usage->hid);
         u8 *data;
         int ret;
-        int n;
+        u32 n;
 
         switch (equivalent_usage) {
         case HID_DG_CONTACTMAX:
@@ -519,7 +519,7 @@ static int wacom_set_device_mode(struct hid_device *hdev,
         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)