From: Roel Kluin Date: Sat, 2 Jan 2010 02:35:11 +0000 (-0800) Subject: Input: gf2k - fix &&/|| confusion in gf2k_connect() X-Git-Tag: upstream/snapshot3+hdmi~14653^2~67 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=abf2a117c67a67fbb611913a31109d0ff66ab073;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Input: gf2k - fix &&/|| confusion in gf2k_connect() This always evaluates to true. Signed-off-by: Roel Kluin Signed-off-by: Dmitry Torokhov --- 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 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv) } #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;