X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Finput%2Fjoydev.c;h=20e2972b9204f25fd5e60d9c051271f0a32acfb8;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=949bdcef8c2be7f7f9365a1fa96719c986b767f7;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 949bdcef8..20e2972b9 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -171,8 +171,9 @@ static int joydev_open(struct inode *inode, struct file *file)
 	if (i >= JOYDEV_MINORS || !joydev_table[i])
 		return -ENODEV;
 
-	if (!(list = kzalloc(sizeof(struct joydev_list), GFP_KERNEL)))
+	if (!(list = kmalloc(sizeof(struct joydev_list), GFP_KERNEL)))
 		return -ENOMEM;
+	memset(list, 0, sizeof(struct joydev_list));
 
 	list->joydev = joydev_table[i];
 	list_add_tail(&list->node, &joydev_table[i]->list);
@@ -456,8 +457,9 @@ static struct input_handle *joydev_connect(struct input_handler *handler, struct
 		return NULL;
 	}
 
-	if (!(joydev = kzalloc(sizeof(struct joydev), GFP_KERNEL)))
+	if (!(joydev = kmalloc(sizeof(struct joydev), GFP_KERNEL)))
 		return NULL;
+	memset(joydev, 0, sizeof(struct joydev));
 
 	INIT_LIST_HEAD(&joydev->list);
 	init_waitqueue_head(&joydev->wait);