Merge branches 'upstream' and 'upstream-fixes' into for-next

9eb331f3 · Jiri Kosina · 4cfae3e8 · 44cb2db1 · 9eb331f3
Commit 9eb331f3 authored Aug 08, 2009 by Jiri Kosina
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/hid/usbhid/hid-quirks.c drivers/hid/usbhid/hid-quirks.c +1 -1

No files found.
--- 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);