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/mouse/psmouse-base.c | |
| parent | f2c853bca542f5ac0b036377637192a74f2091c2 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/input/mouse/psmouse-base.c')
| -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 2bb2fe78bdca..12bdd3eff923 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c | |||
| @@ -883,7 +883,7 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv) | |||
| 883 | psmouse_deactivate(parent); | 883 | psmouse_deactivate(parent); |
| 884 | } | 884 | } |
| 885 | 885 | ||
| 886 | if (!(psmouse = kcalloc(1, sizeof(struct psmouse), GFP_KERNEL))) { | 886 | if (!(psmouse = kzalloc(sizeof(struct psmouse), GFP_KERNEL))) { |
| 887 | retval = -ENOMEM; | 887 | retval = -ENOMEM; |
| 888 | goto out; | 888 | goto out; |
| 889 | } | 889 | } |