diff options
| author | Roel Kluin | 2010-01-02 03:35:11 +0100 |
|---|---|---|
| committer | Dmitry Torokhov | 2010-01-02 03:45:52 +0100 |
| commit | abf2a117c67a67fbb611913a31109d0ff66ab073 (patch) | |
| tree | 5c85f59a97ee6f5f87eb1148725320cae0a3cf42 /drivers/input/joystick/gf2k.c | |
| parent | Input: iforce - wait for command completion when closing the device (diff) | |
| download | kernel-qcow2-linux-abf2a117c67a67fbb611913a31109d0ff66ab073.tar.gz kernel-qcow2-linux-abf2a117c67a67fbb611913a31109d0ff66ab073.tar.xz kernel-qcow2-linux-abf2a117c67a67fbb611913a31109d0ff66ab073.zip | |
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>
Diffstat (limited to 'drivers/input/joystick/gf2k.c')
| -rw-r--r-- | drivers/input/joystick/gf2k.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c index 67c207f5b1a1..45ac70eae0aa 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; |