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/input.c | |
| parent | 28350e330cfab46b60a1dbf763b678d859f9f3d9 (diff) | |
| parent | 9d2e173644bb5c42ff1b280fbdda3f195a7cf1f7 (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 ebbceedc92f4..75e11c7b70fd 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c | |||
| @@ -451,7 +451,6 @@ int input_grab_device(struct input_handle *handle) | |||
| 451 | } | 451 | } |
| 452 | 452 | ||
| 453 | rcu_assign_pointer(dev->grab, handle); | 453 | rcu_assign_pointer(dev->grab, handle); |
| 454 | synchronize_rcu(); | ||
| 455 | 454 | ||
| 456 | out: | 455 | out: |
| 457 | mutex_unlock(&dev->mutex); | 456 | mutex_unlock(&dev->mutex); |