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/mouse | |
| parent | 010988e888a0abbe7118635c1b33d049caae6b29 (diff) | |
| parent | 87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff) | |
Manual merge with Linus
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/psmouse-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 0830c6e13ef6..af24313ff5bb 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c | |||
| @@ -913,7 +913,7 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv) | |||
| 913 | psmouse_deactivate(parent); | 913 | psmouse_deactivate(parent); |
| 914 | } | 914 | } |
| 915 | 915 | ||
| 916 | if (!(psmouse = kcalloc(1, sizeof(struct psmouse), GFP_KERNEL))) { | 916 | if (!(psmouse = kzalloc(sizeof(struct psmouse), GFP_KERNEL))) { |
| 917 | retval = -ENOMEM; | 917 | retval = -ENOMEM; |
| 918 | goto out; | 918 | goto out; |
| 919 | } | 919 | } |