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/serio | |
| parent | 010988e888a0abbe7118635c1b33d049caae6b29 (diff) | |
| parent | 87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff) | |
Manual merge with Linus
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 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 | ||