diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/input/joystick/grip_mp.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/input/joystick/grip_mp.c')
| -rw-r--r-- | drivers/input/joystick/grip_mp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c index 0da7bd133ccf..da17eee6f574 100644 --- a/drivers/input/joystick/grip_mp.c +++ b/drivers/input/joystick/grip_mp.c | |||
| @@ -607,7 +607,7 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv) | |||
| 607 | struct grip_mp *grip; | 607 | struct grip_mp *grip; |
| 608 | int err; | 608 | int err; |
| 609 | 609 | ||
| 610 | if (!(grip = kcalloc(1, sizeof(struct grip_mp), GFP_KERNEL))) | 610 | if (!(grip = kzalloc(sizeof(struct grip_mp), GFP_KERNEL))) |
| 611 | return -ENOMEM; | 611 | return -ENOMEM; |
| 612 | 612 | ||
| 613 | grip->gameport = gameport; | 613 | grip->gameport = gameport; |