diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2005-09-06 15:18:33 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 16:57:45 -0700 |
commit | a97e148a8b8da8b04bc3e18ceb824a8f5f56d567 (patch) | |
tree | 6839a014f4315988e4123e7de68ca35d5585ca09 /drivers/input/serio | |
parent | 874ca6cd3fb454f4dfafd2bbb6c6893303227c3f (diff) | |
download | op-kernel-dev-a97e148a8b8da8b04bc3e18ceb824a8f5f56d567.zip op-kernel-dev-a97e148a8b8da8b04bc3e18ceb824a8f5f56d567.tar.gz |
[PATCH] input: convert kcalloc to kzalloc
This patch converts kcalloc(1, ...) calls to use the new kzalloc() function.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/input/serio')
-rw-r--r-- | drivers/input/serio/serport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c index 79ca384..1bd88fc 100644 --- a/drivers/input/serio/serport.c +++ b/drivers/input/serio/serport.c @@ -87,7 +87,7 @@ static int serport_ldisc_open(struct tty_struct *tty) if (!capable(CAP_SYS_ADMIN)) return -EPERM; - serport = kcalloc(1, sizeof(struct serport), GFP_KERNEL); + serport = kzalloc(sizeof(struct serport), GFP_KERNEL); if (!serport) return -ENOMEM; @@ -165,7 +165,7 @@ static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file, u if (test_and_set_bit(SERPORT_BUSY, &serport->flags)) return -EBUSY; - serport->serio = serio = kcalloc(1, sizeof(struct serio), GFP_KERNEL); + serport->serio = serio = kzalloc(sizeof(struct serio), GFP_KERNEL); if (!serio) return -ENOMEM; |