diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
| commit | c324b44c34050cf2a9b58830e11c974806bd85d8 (patch) | |
| tree | 3ac45a783221283925cd698334a8f5e7dd4c1df8 /drivers/input/joystick/a3d.c | |
| parent | 2fcf522509cceea524b6e7ece8fd6759b682175a (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/input/joystick/a3d.c')
| -rw-r--r-- | drivers/input/joystick/a3d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c index bf34f75b9467..bf65430181fa 100644 --- a/drivers/input/joystick/a3d.c +++ b/drivers/input/joystick/a3d.c | |||
| @@ -269,7 +269,7 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv) | |||
| 269 | int i; | 269 | int i; |
| 270 | int err; | 270 | int err; |
| 271 | 271 | ||
| 272 | if (!(a3d = kcalloc(1, sizeof(struct a3d), GFP_KERNEL))) | 272 | if (!(a3d = kzalloc(sizeof(struct a3d), GFP_KERNEL))) |
| 273 | return -ENOMEM; | 273 | return -ENOMEM; |
| 274 | 274 | ||
| 275 | a3d->gameport = gameport; | 275 | a3d->gameport = gameport; |