diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 16:10:34 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 16:10:34 -0500 |
| commit | 12df7556705aae97f24a397377e17898700d7192 (patch) | |
| tree | 5adc6b1c2aa940263ee2e88fc6645918533da539 /drivers/input/serio/rpckbd.c | |
| parent | 34ddf733c415a8e336c996a4303d9f336e0c81b5 (diff) | |
| parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/input/serio/rpckbd.c')
| -rw-r--r-- | drivers/input/serio/rpckbd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c index a3bd11589bc..513d37fc1ac 100644 --- a/drivers/input/serio/rpckbd.c +++ b/drivers/input/serio/rpckbd.c @@ -111,11 +111,10 @@ static int __devinit rpckbd_probe(struct platform_device *dev) { struct serio *serio; - serio = kmalloc(sizeof(struct serio), GFP_KERNEL); + serio = kzalloc(sizeof(struct serio), GFP_KERNEL); if (!serio) return -ENOMEM; - memset(serio, 0, sizeof(struct serio)); serio->id.type = SERIO_8042; serio->write = rpckbd_write; serio->open = rpckbd_open; |