3 files changed, 7 insertions, 6 deletions

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 538bf28e4dd5..d7b2f6868a6d 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -97,7 +97,7 @@ static struct hid_field *hid_register_field(struct hid_report *report, unsigned
         field->index = report->maxfield++;
         report->field[field->index] = field;
         field->usage = (struct hid_usage *)(field + 1);
-        field->value = (unsigned *)(field->usage + usages);
+        field->value = (s32 *)(field->usage + usages);
         field->report = report;
 
         return field;
diff --git a/drivers/hid/hid-input-quirks.c b/drivers/hid/hid-input-quirks.c
index 845d31d08fa5..4c2052c658f1 100644
--- a/drivers/hid/hid-input-quirks.c
+++ b/drivers/hid/hid-input-quirks.c
@@ -353,7 +353,7 @@ static const struct hid_input_blacklist {
 
         { VENDOR_ID_SUNPLUS, DEVICE_ID_SUNPLUS_WDESKTOP, quirk_sunplus_wdesktop },
 
-        { 0, 0, 0 }
+        { 0, 0, NULL }
 };
 
 int hidinput_mapping_quirks(struct hid_usage *usage, 
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index b4ad5d175280..120b49d2b4a6 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -610,10 +610,11 @@ static void usbhid_set_leds(struct hid_device *hid)
 /*
  * Traverse the supplied list of reports and find the longest
  */
-static void hid_find_max_report(struct hid_device *hid, unsigned int type, int *max)
+static void hid_find_max_report(struct hid_device *hid, unsigned int type,
+                unsigned int *max)
 {
         struct hid_report *report;
-        int size;
+        unsigned int size;
 
         list_for_each_entry(report, &hid->report_enum[type].report_list, list) {
                 size = ((report->size - 1) >> 3) + 1;
@@ -705,9 +706,9 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
         struct hid_descriptor *hdesc;
         struct hid_device *hid;
         u32 quirks = 0;
-        unsigned rsize = 0;
+        unsigned int insize = 0, rsize = 0;
         char *rdesc;
-        int n, len, insize = 0;
+        int n, len;
         struct usbhid_device *usbhid;
 
         quirks = usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),