commit abf2a117c67a67fbb611913a31109d0ff66ab073
author Roel Kluin <roel.kluin@gmail.com> Fri Jan 01 18:35:11 2010 -0800
committer Dmitry Torokhov <dmitry.torokhov@gmail.com> Fri Jan 01 18:45:52 2010 -0800
tree 5c85f59a97ee6f5f87eb1148725320cae0a3cf42
parent c2b27ef672992a206e5b221b8676972dd840ffa5

Input: gf2k - fix &&/|| confusion in gf2k_connect()

This always evaluates to true.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

drivers/input/joystick/gf2k.c

diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c
index 67c207f..45ac70e 100644
--- a/drivers/input/joystick/gf2k.c
+++ b/drivers/input/joystick/gf2k.c
@@ -277,7 +277,7 @@
 	}
 
 #ifdef RESET_WORKS
-	if ((gf2k->id != (GB(19,2,0) | GB(15,3,2) | GB(12,3,5))) ||
+	if ((gf2k->id != (GB(19,2,0) | GB(15,3,2) | GB(12,3,5))) &&
 	    (gf2k->id != (GB(31,2,0) | GB(27,3,2) | GB(24,3,5)))) {
 		err = -ENODEV;
 		goto fail2;