From 0591e3cf3cb088f042cb68ca6a5e32b5e714c719 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Sat, 10 Sep 2005 12:04:42 -0500 Subject: [PATCH] --- yaml --- r: 8478 b: refs/heads/master c: d39969deee4b541be4ee5789a2e4c14511c886e2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/serio/i8042.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1cf9b66b9232..b20a60503b09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe1e86049813641a518d15adf7191bd711b4f611 +refs/heads/master: d39969deee4b541be4ee5789a2e4c14511c886e2 diff --git a/trunk/drivers/input/serio/i8042.c b/trunk/drivers/input/serio/i8042.c index 19ef35db342e..40d451ce07ff 100644 --- a/trunk/drivers/input/serio/i8042.c +++ b/trunk/drivers/input/serio/i8042.c @@ -986,7 +986,7 @@ static int __init i8042_create_kbd_port(void) struct serio *serio; struct i8042_port *port = &i8042_ports[I8042_KBD_PORT_NO]; - serio = kcalloc(1, sizeof(struct serio), GFP_KERNEL); + serio = kzalloc(sizeof(struct serio), GFP_KERNEL); if (!serio) return -ENOMEM; @@ -1011,7 +1011,7 @@ static int __init i8042_create_aux_port(void) struct serio *serio; struct i8042_port *port = &i8042_ports[I8042_AUX_PORT_NO]; - serio = kcalloc(1, sizeof(struct serio), GFP_KERNEL); + serio = kzalloc(sizeof(struct serio), GFP_KERNEL); if (!serio) return -ENOMEM; @@ -1036,7 +1036,7 @@ static int __init i8042_create_mux_port(int index) struct serio *serio; struct i8042_port *port = &i8042_ports[I8042_MUX_PORT_NO + index]; - serio = kcalloc(1, sizeof(struct serio), GFP_KERNEL); + serio = kzalloc(sizeof(struct serio), GFP_KERNEL); if (!serio) return -ENOMEM;