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/gameport/fm801-gp.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/gameport/fm801-gp.c')
-rw-r--r-- | drivers/input/gameport/fm801-gp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/gameport/fm801-gp.c b/drivers/input/gameport/fm801-gp.c index 57615bc63906..47e93daa0fa7 100644 --- a/drivers/input/gameport/fm801-gp.c +++ b/drivers/input/gameport/fm801-gp.c @@ -83,7 +83,7 @@ static int __devinit fm801_gp_probe(struct pci_dev *pci, const struct pci_device struct fm801_gp *gp; struct gameport *port; - gp = kcalloc(1, sizeof(struct fm801_gp), GFP_KERNEL); + gp = kzalloc(sizeof(struct fm801_gp), GFP_KERNEL); port = gameport_allocate_port(); if (!gp || !port) { printk(KERN_ERR "fm801-gp: Memory allocation failed\n"); |