2 files changed, 2 insertions, 8 deletions

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 25f38a5af269..1b0e07a67d6d 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -4,8 +4,8 @@
  *  Copyright (c) 1999 Andreas Gal
  *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
  *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
- *  Copyright (c) 2006-2008 Jiri Kosina
  *  Copyright (c) 2007-2008 Oliver Neukum
+ *  Copyright (c) 2006-2009 Jiri Kosina
  */
 
 /*
@@ -886,11 +886,6 @@ static int usbhid_parse(struct hid_device *hid)
                 goto err;
         }
 
-        dbg_hid("report descriptor (size %u, read %d) = ", rsize, n);
-        for (n = 0; n < rsize; n++)
-                dbg_hid_line(" %02x", (unsigned char) rdesc[n]);
-        dbg_hid_line("\n");
-
         ret = hid_parse_report(hid, rdesc, rsize);
         kfree(rdesc);
         if (ret) {
@@ -1004,7 +999,6 @@ static int usbhid_start(struct hid_device *hid)
         usbhid->urbctrl->transfer_flags |= (URB_NO_TRANSFER_DMA_MAP | URB_NO_SETUP_DMA_MAP);
 
         usbhid_init_reports(hid);
-        hid_dump_device(hid);
 
         set_bit(HID_STARTED, &usbhid->iofl);
 
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index d8f7423f363e..0d9045aa2c4b 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -201,7 +201,7 @@ int usbhid_quirks_init(char **quirks_param)
         u32 quirks;
         int n = 0, m;
 
-        for (; quirks_param[n] && n < MAX_USBHID_BOOT_QUIRKS; n++) {
+        for (; n < MAX_USBHID_BOOT_QUIRKS && quirks_param[n]; n++) {
 
                 m = sscanf(quirks_param[n], "0x%hx:0x%hx:0x%x",
                                 &idVendor, &idProduct, &quirks);