Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / staging / panel / panel.c

diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index 377884f3480d8e28a1a4467c3e6270a274dcad94..9ca0e9e2a96174c1f25672c0b9614315af3b0312 100644 (file)
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -57,7 +57,7 @@
 #include <generated/utsrelease.h>
 
 #include <linux/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/system.h>
 
 #define LCD_MINOR              156
@@ -1906,12 +1906,11 @@ static struct logical_input *panel_bind_key(char *name, char *press,
 {
        struct logical_input *key;
 
-       key = kmalloc(sizeof(struct logical_input), GFP_KERNEL);
+       key = kzalloc(sizeof(struct logical_input), GFP_KERNEL);
        if (!key) {
                printk(KERN_ERR "panel: not enough memory\n");
                return NULL;
        }
-       memset(key, 0, sizeof(struct logical_input));
        if (!input_name2mask(name, &key->mask, &key->value, &scan_mask_i,
                             &scan_mask_o))
                return NULL;