diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2005-09-06 18:18:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 19:57:45 -0400 |
commit | a97e148a8b8da8b04bc3e18ceb824a8f5f56d567 (patch) | |
tree | 6839a014f4315988e4123e7de68ca35d5585ca09 /drivers/input/serio/serport.c | |
parent | 874ca6cd3fb454f4dfafd2bbb6c6893303227c3f (diff) |
[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/serport.c')
-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 79ca38469159..1bd88fca0542 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) | |||
87 | if (!capable(CAP_SYS_ADMIN)) | 87 | if (!capable(CAP_SYS_ADMIN)) |
88 | return -EPERM; | 88 | return -EPERM; |
89 | 89 | ||
90 | serport = kcalloc(1, sizeof(struct serport), GFP_KERNEL); | 90 | serport = kzalloc(sizeof(struct serport), GFP_KERNEL); |
91 | if (!serport) | 91 | if (!serport) |
92 | return -ENOMEM; | 92 | return -ENOMEM; |
93 | 93 | ||
@@ -165,7 +165,7 @@ static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file, u | |||
165 | if (test_and_set_bit(SERPORT_BUSY, &serport->flags)) | 165 | if (test_and_set_bit(SERPORT_BUSY, &serport->flags)) |
166 | return -EBUSY; | 166 | return -EBUSY; |
167 | 167 | ||
168 | serport->serio = serio = kcalloc(1, sizeof(struct serio), GFP_KERNEL); | 168 | serport->serio = serio = kzalloc(sizeof(struct serio), GFP_KERNEL); |
169 | if (!serio) | 169 | if (!serio) |
170 | return -ENOMEM; | 170 | return -ENOMEM; |
171 | 171 | ||