diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-04-16 11:51:52 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-04-16 11:51:52 -0400 |
| commit | 0c387ec88abf4f1ddfe8c3be10ea981bc447b406 (patch) | |
| tree | 7510842a16aa54e3fec96aed2b3126109cda8d85 /drivers/input/input.c | |
| parent | ba28f22e7cf16cb310bb491cbb3f7d0d5d1f5c5d (diff) | |
| parent | 3f3e7c6e139f704e2f48ea3b45ff7724a8d46456 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/input.c')
| -rw-r--r-- | drivers/input/input.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index d44065d2e662..935a1835de2d 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c | |||
| @@ -1549,7 +1549,6 @@ int input_register_handle(struct input_handle *handle) | |||
| 1549 | return error; | 1549 | return error; |
| 1550 | list_add_tail_rcu(&handle->d_node, &dev->h_list); | 1550 | list_add_tail_rcu(&handle->d_node, &dev->h_list); |
| 1551 | mutex_unlock(&dev->mutex); | 1551 | mutex_unlock(&dev->mutex); |
| 1552 | synchronize_rcu(); | ||
| 1553 | 1552 | ||
| 1554 | /* | 1553 | /* |
| 1555 | * Since we are supposed to be called from ->connect() | 1554 | * Since we are supposed to be called from ->connect() |