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/sidewinder.c | |
| parent | f2c853bca542f5ac0b036377637192a74f2091c2 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/input/joystick/sidewinder.c')
| -rw-r--r-- | drivers/input/joystick/sidewinder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c index 47144a7ed9e7..9e0353721a35 100644 --- a/drivers/input/joystick/sidewinder.c +++ b/drivers/input/joystick/sidewinder.c | |||
| @@ -590,7 +590,7 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv) | |||
| 590 | 590 | ||
| 591 | comment[0] = 0; | 591 | comment[0] = 0; |
| 592 | 592 | ||
| 593 | sw = kcalloc(1, sizeof(struct sw), GFP_KERNEL); | 593 | sw = kzalloc(sizeof(struct sw), GFP_KERNEL); |
| 594 | buf = kmalloc(SW_LENGTH, GFP_KERNEL); | 594 | buf = kmalloc(SW_LENGTH, GFP_KERNEL); |
| 595 | idbuf = kmalloc(SW_LENGTH, GFP_KERNEL); | 595 | idbuf = kmalloc(SW_LENGTH, GFP_KERNEL); |
| 596 | if (!sw || !buf || !idbuf) { | 596 | if (!sw || !buf || !idbuf) { |