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
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
input
/
joydev.c
diff --git
a/drivers/input/joydev.c
b/drivers/input/joydev.c
index
3e47218
..
4fe982d
100644
(file)
--- a/
drivers/input/joydev.c
+++ b/
drivers/input/joydev.c
@@
-143,9
+143,7
@@
static int joydev_fasync(int fd, struct file *file, int on)
static void joydev_free(struct joydev *joydev)
{
static void joydev_free(struct joydev *joydev)
{
- devfs_remove("input/js%d", joydev->minor);
joydev_table[joydev->minor] = NULL;
joydev_table[joydev->minor] = NULL;
- class_simple_device_remove(MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));
kfree(joydev);
}
kfree(joydev);
}
@@
-466,6
+464,8
@@
static void joydev_disconnect(struct input_handle *handle)
{
struct joydev *joydev = handle->private;
{
struct joydev *joydev = handle->private;
+ class_simple_device_remove(MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));
+ devfs_remove("input/js%d", joydev->minor);
joydev->exist = 0;
if (joydev->open)
joydev->exist = 0;
if (joydev->open)