---

yaml --- r: 306607 b: refs/heads/master c: dba4258 h: refs/heads/master i: 306605: 7b4f000 306603: df0422e 306599: e94ff2b 306591: 00d83fe v: v3
git-mirror · May 2, 2012 · 8a843a8 · 8a843a8
1 parent 3195add
commit 8a843a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f31ad406693f114e57ad4651eb17deb68419c7cb
+refs/heads/master: dba4258068f822b7dafc78c28fe9c99c551eca7e
diff --git a/trunk/drivers/input/evdev.c b/trunk/drivers/input/evdev.c
@@ -180,7 +180,10 @@ static int evdev_grab(struct evdev *evdev, struct evdev_client *client)
 
 static int evdev_ungrab(struct evdev *evdev, struct evdev_client *client)
 {
-	if (evdev->grab != client)
+	struct evdev_client *grab = rcu_dereference_protected(evdev->grab,
+					lockdep_is_held(&evdev->mutex));
+
+	if (grab != client)
 		return  -EINVAL;
 
 	rcu_assign_pointer(evdev->grab, NULL);
@@ -259,8 +262,7 @@ static int evdev_release(struct inode *inode, struct file *file)
 	struct evdev *evdev = client->evdev;
 
 	mutex_lock(&evdev->mutex);
-	if (evdev->grab == client)
-		evdev_ungrab(evdev, client);
+	evdev_ungrab(evdev, client);
 	mutex_unlock(&evdev->mutex);
 
 	evdev_detach_client(evdev, client);