Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

[pandora-kernel.git] / drivers / s390 / char / keyboard.c

diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c
index a317a12..d4d2ff0 100644 (file)
--- a/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@ -50,14 +50,12 @@ kbd_alloc(void) {
        struct kbd_data *kbd;
        int i, len;
 
-       kbd = kmalloc(sizeof(struct kbd_data), GFP_KERNEL);
+       kbd = kzalloc(sizeof(struct kbd_data), GFP_KERNEL);
        if (!kbd)
                goto out;
-       memset(kbd, 0, sizeof(struct kbd_data));
-       kbd->key_maps = kmalloc(sizeof(key_maps), GFP_KERNEL);
-       if (!key_maps)
+       kbd->key_maps = kzalloc(sizeof(key_maps), GFP_KERNEL);
+       if (!kbd->key_maps)
                goto out_kbd;
-       memset(kbd->key_maps, 0, sizeof(key_maps));
        for (i = 0; i < ARRAY_SIZE(key_maps); i++) {
                if (key_maps[i]) {
                        kbd->key_maps[i] =
@@ -68,10 +66,9 @@ kbd_alloc(void) {
                               sizeof(u_short)*NR_KEYS);
                }
        }
-       kbd->func_table = kmalloc(sizeof(func_table), GFP_KERNEL);
+       kbd->func_table = kzalloc(sizeof(func_table), GFP_KERNEL);
        if (!kbd->func_table)
                goto out_maps;
-       memset(kbd->func_table, 0, sizeof(func_table));
        for (i = 0; i < ARRAY_SIZE(func_table); i++) {
                if (func_table[i]) {
                        len = strlen(func_table[i]) + 1;
@@ -82,10 +79,9 @@ kbd_alloc(void) {
                }
        }
        kbd->fn_handler =
-               kmalloc(sizeof(fn_handler_fn *) * NR_FN_HANDLER, GFP_KERNEL);
+               kzalloc(sizeof(fn_handler_fn *) * NR_FN_HANDLER, GFP_KERNEL);
        if (!kbd->fn_handler)
                goto out_func;
-       memset(kbd->fn_handler, 0, sizeof(fn_handler_fn *) * NR_FN_HANDLER);
        kbd->accent_table =
                kmalloc(sizeof(struct kbdiacr)*MAX_DIACR, GFP_KERNEL);
        if (!kbd->accent_table)