diff options
| author | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
| commit | ab386128f20c44c458a90039ab1bdc265ac474c9 (patch) | |
| tree | 2ad188744922b1bb951fd10ff50dc04c83acce22 /drivers/input/joystick/gf2k.c | |
| parent | dbfc196a3cc1a2514ad0737a82f764de23bd65e6 (diff) | |
| parent | ab658321f32770b903a4426e2a6fae0392757755 (diff) | |
Merge branch 'master' into percpu
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) | |||
| 277 | } | 277 | } |
| 278 | 278 | ||
| 279 | #ifdef RESET_WORKS | 279 | #ifdef RESET_WORKS |
| 280 | if ((gf2k->id != (GB(19,2,0) | GB(15,3,2) | GB(12,3,5))) || | 280 | if ((gf2k->id != (GB(19,2,0) | GB(15,3,2) | GB(12,3,5))) && |
| 281 | (gf2k->id != (GB(31,2,0) | GB(27,3,2) | GB(24,3,5)))) { | 281 | (gf2k->id != (GB(31,2,0) | GB(27,3,2) | GB(24,3,5)))) { |
| 282 | err = -ENODEV; | 282 | err = -ENODEV; |
| 283 | goto fail2; | 283 | goto fail2; |