git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
input
/
joydev.c
diff --git
a/drivers/input/joydev.c
b/drivers/input/joydev.c
index
949bdce
..
20e2972
100644
(file)
--- 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 (i >= JOYDEV_MINORS || !joydev_table[i])
return -ENODEV;
- if (!(list = k
z
alloc(sizeof(struct joydev_list), GFP_KERNEL)))
+ if (!(list = k
m
alloc(sizeof(struct joydev_list), GFP_KERNEL)))
return -ENOMEM;
return -ENOMEM;
+ memset(list, 0, sizeof(struct joydev_list));
list->joydev = joydev_table[i];
list_add_tail(&list->node, &joydev_table[i]->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;
}
return NULL;
}
- if (!(joydev = k
z
alloc(sizeof(struct joydev), GFP_KERNEL)))
+ if (!(joydev = k
m
alloc(sizeof(struct joydev), GFP_KERNEL)))
return NULL;
return NULL;
+ memset(joydev, 0, sizeof(struct joydev));
INIT_LIST_HEAD(&joydev->list);
init_waitqueue_head(&joydev->wait);
INIT_LIST_HEAD(&joydev->list);
init_waitqueue_head(&joydev->wait);