projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[powerpc.git]
/
drivers
/
input
/
mouse
/
psmouse-base.c
diff --git
a/drivers/input/mouse/psmouse-base.c
b/drivers/input/mouse/psmouse-base.c
index
2bb2fe7
..
12bdd3e
100644
(file)
--- 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)
psmouse_deactivate(parent);
}
- if (!(psmouse = k
calloc(1,
sizeof(struct psmouse), GFP_KERNEL))) {
+ if (!(psmouse = k
zalloc(
sizeof(struct psmouse), GFP_KERNEL))) {
retval = -ENOMEM;
goto out;
}