aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/serio_raw.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/serio/serio_raw.c')
-rw-r--r--drivers/input/serio/serio_raw.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index 8734e7f75b7..5a2703b536d 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -96,12 +96,11 @@ static int serio_raw_open(struct inode *inode, struct file *file)
96 goto out; 96 goto out;
97 } 97 }
98 98
99 if (!(list = kmalloc(sizeof(struct serio_raw_list), GFP_KERNEL))) { 99 if (!(list = kzalloc(sizeof(struct serio_raw_list), GFP_KERNEL))) {
100 retval = -ENOMEM; 100 retval = -ENOMEM;
101 goto out; 101 goto out;
102 } 102 }
103 103
104 memset(list, 0, sizeof(struct serio_raw_list));
105 list->serio_raw = serio_raw; 104 list->serio_raw = serio_raw;
106 file->private_data = list; 105 file->private_data = list;
107 106
@@ -276,14 +275,13 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
276 struct serio_raw *serio_raw; 275 struct serio_raw *serio_raw;
277 int err; 276 int err;
278 277
279 if (!(serio_raw = kmalloc(sizeof(struct serio_raw), GFP_KERNEL))) { 278 if (!(serio_raw = kzalloc(sizeof(struct serio_raw), GFP_KERNEL))) {
280 printk(KERN_ERR "serio_raw.c: can't allocate memory for a device\n"); 279 printk(KERN_ERR "serio_raw.c: can't allocate memory for a device\n");
281 return -ENOMEM; 280 return -ENOMEM;
282 } 281 }
283 282
284 mutex_lock(&serio_raw_mutex); 283 mutex_lock(&serio_raw_mutex);
285 284
286 memset(serio_raw, 0, sizeof(struct serio_raw));
287 snprintf(serio_raw->name, sizeof(serio_raw->name), "serio_raw%d", serio_raw_no++); 285 snprintf(serio_raw->name, sizeof(serio_raw->name), "serio_raw%d", serio_raw_no++);
288 serio_raw->refcnt = 1; 286 serio_raw->refcnt = 1;
289 serio_raw->serio = serio; 287 serio_raw->serio = serio;