diff options
Diffstat (limited to 'drivers/staging/panel/panel.c')
| -rw-r--r-- | drivers/staging/panel/panel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c index 377884f3480d..9ca0e9e2a961 100644 --- 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; |