---

yaml --- r: 346921 b: refs/heads/master c: adc4633 h: refs/heads/master i: 346919: 41b1790 v: v3
git-mirror · Oct 25, 2012 · 0e226f1 · 0e226f1
1 parent 00fb887
commit 0e226f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5161870f51acd74442375a6693c0586996d01f44
+refs/heads/master: adc4633c86f3358fce676b6c7ce75055e395123a
diff --git a/trunk/drivers/input/input.c b/trunk/drivers/input/input.c
@@ -534,8 +534,11 @@ EXPORT_SYMBOL(input_grab_device);
 static void __input_release_device(struct input_handle *handle)
 {
 	struct input_dev *dev = handle->dev;
+	struct input_handle *grabber;
 
-	if (dev->grab == handle) {
+	grabber = rcu_dereference_protected(dev->grab,
+					    lockdep_is_held(&dev->mutex));
+	if (grabber == handle) {
 		rcu_assign_pointer(dev->grab, NULL);
 		/* Make sure input_pass_event() notices that grab is gone */
 		synchronize_rcu();