[patch] 2.6.2-mm1: fix warning introduced by input-2wheel-mouse-fix

[Adrian Bunk]

On Thu, Feb 05, 2004 at 09:58:18AM -0800, John Cherry wrote:
>...
> The nit warnings that sprung up in the defconfig builds are...
>...
> drivers/usb/input/hid-input.c: In function `hidinput_hid_event':
> drivers/usb/input/hid-input.c:436: warning: suggest parentheses around
> && within ||
>...

This one's easy to fix:

--- linux-2.6.2-mm1/drivers/usb/input/hid-input.c.old	2004-02-06 00:05:19.000000000 +0100
+++ linux-2.6.2-mm1/drivers/usb/input/hid-input.c	2004-02-06 00:05:50.000000000 +0100
@@ -433,7 +433,7 @@
 	input_regs(input, regs);
 
 	if (((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_EXTRA) && (usage->code == BTN_EXTRA))
-		|| (hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_BACK) && (usage->code == BTN_BACK)) {
+		|| ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_BACK) && (usage->code == BTN_BACK))) {
 		if (value)
 			hid->quirks |= HID_QUIRK_2WHEEL_MOUSE_HACK_ON;
 		else


Please apply
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/