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/db9.c | |
| parent | f2c853bca542f5ac0b036377637192a74f2091c2 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/input/joystick/db9.c')
| -rw-r--r-- | drivers/input/joystick/db9.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c index fbd3eed07f90..2a3e4bb2da50 100644 --- a/drivers/input/joystick/db9.c +++ b/drivers/input/joystick/db9.c | |||
| @@ -572,7 +572,7 @@ static struct db9 __init *db9_probe(int *config, int nargs) | |||
| 572 | } | 572 | } |
| 573 | } | 573 | } |
| 574 | 574 | ||
| 575 | if (!(db9 = kcalloc(1, sizeof(struct db9), GFP_KERNEL))) { | 575 | if (!(db9 = kzalloc(sizeof(struct db9), GFP_KERNEL))) { |
| 576 | parport_put_port(pp); | 576 | parport_put_port(pp); |
| 577 | return NULL; | 577 | return NULL; |
| 578 | } | 578 | } |