diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-05-26 00:51:55 -0400 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-05-26 00:51:55 -0400 |
| commit | ece928df16494becd43f999aff9bd530182e7e81 (patch) | |
| tree | 905042764ea5d8ab6eda63666406e19f607bcf4c /drivers/input/mousedev.c | |
| parent | 3d1c1829ebe7e8bb48a997b39b4865abc9197e5e (diff) | |
| parent | dda54e76d7dba0532ebdd72e0b4f492a03f83225 (diff) | |
Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2-merge-window
Conflicts:
fs/ocfs2/ioctl.c
Diffstat (limited to 'drivers/input/mousedev.c')
| -rw-r--r-- | drivers/input/mousedev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index 7630273e9474..257e033986e4 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c | |||
| @@ -508,7 +508,6 @@ static void mousedev_attach_client(struct mousedev *mousedev, | |||
| 508 | spin_lock(&mousedev->client_lock); | 508 | spin_lock(&mousedev->client_lock); |
| 509 | list_add_tail_rcu(&client->node, &mousedev->client_list); | 509 | list_add_tail_rcu(&client->node, &mousedev->client_list); |
| 510 | spin_unlock(&mousedev->client_lock); | 510 | spin_unlock(&mousedev->client_lock); |
| 511 | synchronize_rcu(); | ||
| 512 | } | 511 | } |
| 513 | 512 | ||
| 514 | static void mousedev_detach_client(struct mousedev *mousedev, | 513 | static void mousedev_detach_client(struct mousedev *mousedev, |