---

yaml --- r: 361855 b: refs/heads/master c: e8cd816 h: refs/heads/master i: 361853: 8b0c884 361851: 5ab267e 361847: 6149277 361839: 27a41d4 361823: ab87829 361791: 4441a32 361727: 4b196b2 v: v3
git-mirror · Mar 27, 2013 · e1ed650 · e1ed650
1 parent 985792b
commit e1ed650
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ea600b5314529f9d1b9d6d3c41cb26fce6a7a4a
+refs/heads/master: e8cd81693bbbb15db57d3c9aa7dd90eda4842874
diff --git a/trunk/drivers/tty/vt/vc_screen.c b/trunk/drivers/tty/vt/vc_screen.c
@@ -93,7 +93,7 @@ vcs_poll_data_free(struct vcs_poll_data *poll)
 static struct vcs_poll_data *
 vcs_poll_data_get(struct file *file)
 {
-	struct vcs_poll_data *poll = file->private_data;
+	struct vcs_poll_data *poll = file->private_data, *kill = NULL;
 
 	if (poll)
 		return poll;
@@ -122,10 +122,12 @@ vcs_poll_data_get(struct file *file)
 		file->private_data = poll;
 	} else {
 		/* someone else raced ahead of us */
-		vcs_poll_data_free(poll);
+		kill = poll;
 		poll = file->private_data;
 	}
 	spin_unlock(&file->f_lock);
+	if (kill)
+		vcs_poll_data_free(kill);
 
 	return poll;
 }