diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-09-25 05:14:45 +0200 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-09-25 05:14:45 +0200 |
commit | 4e0c1159d83a658d1ffba5bc3442f4ec4cadb436 (patch) | |
tree | 36a5079ba7ba9b9e0f2f633356705b980940eac4 /drivers/input/joystick/grip.c | |
parent | drm: add radeon PCI express support (diff) | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-ucb (diff) | |
download | linux-4e0c1159d83a658d1ffba5bc3442f4ec4cadb436.tar.xz linux-4e0c1159d83a658d1ffba5bc3442f4ec4cadb436.zip |
update from upstream
Diffstat (limited to 'drivers/input/joystick/grip.c')
-rw-r--r-- | drivers/input/joystick/grip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c index d1500d2562d6..9d3f910dd568 100644 --- a/drivers/input/joystick/grip.c +++ b/drivers/input/joystick/grip.c @@ -301,7 +301,7 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv) int i, j, t; int err; - if (!(grip = kcalloc(1, sizeof(struct grip), GFP_KERNEL))) + if (!(grip = kzalloc(sizeof(struct grip), GFP_KERNEL))) return -ENOMEM; grip->gameport = gameport; |