diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 21:14:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 21:14:47 -0400 |
| commit | d344c5e0856ad03278d8700b503762dbc8b86e12 (patch) | |
| tree | a6d893a643470a3c2580a58f3228a55fa1fd1d82 /drivers/input/joystick/guillemot.c | |
| parent | 010988e888a0abbe7118635c1b33d049caae6b29 (diff) | |
| parent | 87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff) | |
Manual merge with Linus
Diffstat (limited to 'drivers/input/joystick/guillemot.c')
| -rw-r--r-- | drivers/input/joystick/guillemot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c index f93da7bc082d..6a70ec429f06 100644 --- a/drivers/input/joystick/guillemot.c +++ b/drivers/input/joystick/guillemot.c | |||
| @@ -183,7 +183,7 @@ static int guillemot_connect(struct gameport *gameport, struct gameport_driver * | |||
| 183 | int i, t; | 183 | int i, t; |
| 184 | int err; | 184 | int err; |
| 185 | 185 | ||
| 186 | if (!(guillemot = kcalloc(1, sizeof(struct guillemot), GFP_KERNEL))) | 186 | if (!(guillemot = kzalloc(sizeof(struct guillemot), GFP_KERNEL))) |
| 187 | return -ENOMEM; | 187 | return -ENOMEM; |
| 188 | 188 | ||
| 189 | guillemot->gameport = gameport; | 189 | guillemot->gameport = gameport; |