* [PATCH] Input: &&/|| confusion in gf2k_connect()?
@ 2009-12-31 12:19 Roel Kluin
2010-01-02 2:43 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Roel Kluin @ 2009-12-31 12:19 UTC (permalink / raw)
To: Dmitry Torokhov, Dmitry Torokhov, linux-input, Andrew Morton,
LKML
This always evaluates to true.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
drivers/input/joystick/gf2k.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
I am not 100% certain, but wasn't this intended?
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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Input: &&/|| confusion in gf2k_connect()?
2009-12-31 12:19 [PATCH] Input: &&/|| confusion in gf2k_connect()? Roel Kluin
@ 2010-01-02 2:43 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2010-01-02 2:43 UTC (permalink / raw)
To: Roel Kluin; +Cc: linux-input, Andrew Morton, LKML
On Thu, Dec 31, 2009 at 01:19:43PM +0100, Roel Kluin wrote:
> This always evaluates to true.
>
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Applied to 'for-linus', thank you Roel.
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-01-02 2:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-31 12:19 [PATCH] Input: &&/|| confusion in gf2k_connect()? Roel Kluin
2010-01-02 2:43 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).