diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
| commit | 5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c (patch) | |
| tree | 2f83dc6949763e77cf6422e696dc6146684dcf4e /drivers/input/joystick/gamecon.c | |
| parent | f2c853bca542f5ac0b036377637192a74f2091c2 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/input/joystick/gamecon.c')
| -rw-r--r-- | drivers/input/joystick/gamecon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c index 95bbdd302aad..5427bf9fc862 100644 --- a/drivers/input/joystick/gamecon.c +++ b/drivers/input/joystick/gamecon.c | |||
| @@ -554,7 +554,7 @@ static struct gc __init *gc_probe(int *config, int nargs) | |||
| 554 | return NULL; | 554 | return NULL; |
| 555 | } | 555 | } |
| 556 | 556 | ||
| 557 | if (!(gc = kcalloc(1, sizeof(struct gc), GFP_KERNEL))) { | 557 | if (!(gc = kzalloc(sizeof(struct gc), GFP_KERNEL))) { |
| 558 | parport_put_port(pp); | 558 | parport_put_port(pp); |
| 559 | return NULL; | 559 | return NULL; |
| 560 | } | 560 | } |