diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 03:06:26 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 03:06:26 -0400 |
commit | b73077eb03f510a84b102fb97640e595a958403c (patch) | |
tree | 8b639000418e2756bf6baece4e00e07d2534bccc /drivers/input/joydev.c | |
parent | 28350e330cfab46b60a1dbf763b678d859f9f3d9 (diff) | |
parent | 9d2e173644bb5c42ff1b280fbdda3f195a7cf1f7 (diff) |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/joydev.c')
-rw-r--r-- | drivers/input/joydev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 3182c9cd1b0e..c24ec2d5f926 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c | |||
@@ -180,7 +180,6 @@ static void joydev_attach_client(struct joydev *joydev, | |||
180 | spin_lock(&joydev->client_lock); | 180 | spin_lock(&joydev->client_lock); |
181 | list_add_tail_rcu(&client->node, &joydev->client_list); | 181 | list_add_tail_rcu(&client->node, &joydev->client_list); |
182 | spin_unlock(&joydev->client_lock); | 182 | spin_unlock(&joydev->client_lock); |
183 | synchronize_rcu(); | ||
184 | } | 183 | } |
185 | 184 | ||
186 | static void joydev_detach_client(struct joydev *joydev, | 185 | static void joydev_detach_client(struct joydev *joydev, |
@@ -758,7 +757,7 @@ static void joydev_remove_chrdev(struct joydev *joydev) | |||
758 | } | 757 | } |
759 | 758 | ||
760 | /* | 759 | /* |
761 | * Mark device non-existant. This disables writes, ioctls and | 760 | * Mark device non-existent. This disables writes, ioctls and |
762 | * prevents new users from opening the device. Already posted | 761 | * prevents new users from opening the device. Already posted |
763 | * blocking reads will stay, however new ones will fail. | 762 | * blocking reads will stay, however new ones will fail. |
764 | */ | 763 | */ |
@@ -777,7 +776,7 @@ static void joydev_cleanup(struct joydev *joydev) | |||
777 | joydev_hangup(joydev); | 776 | joydev_hangup(joydev); |
778 | joydev_remove_chrdev(joydev); | 777 | joydev_remove_chrdev(joydev); |
779 | 778 | ||
780 | /* joydev is marked dead so noone else accesses joydev->open */ | 779 | /* joydev is marked dead so no one else accesses joydev->open */ |
781 | if (joydev->open) | 780 | if (joydev->open) |
782 | input_close_device(handle); | 781 | input_close_device(handle); |
783 | } | 782 | } |