Merge with /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git/

[linux-2.6] / drivers / input / serio / i8042.c

diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 19ef35db342eea38d5e6b0191e843db92e6da6ae..40d451ce07ffecac8052e973e126ae112e256505 100644 (file)
--- a/drivers/input/serio/i8042.c
+++ b/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;