---

yaml --- r: 119487 b: refs/heads/master c: 296fa7f h: refs/heads/master i: 119485: 04b71ea 119483: c6681da 119479: 2516c54 119471: 5b4a83c 119455: a80854b 119423: 66b6d25 v: v3
git-mirror · Dec 1, 2008 · 4365bd2 · 4365bd2
1 parent f1ef96b
commit 4365bd2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4dcfbee3b536c9125762e8f6681ac6be0e9256b
+refs/heads/master: 296fa7f6a3f3342d40df7713e74246198295654b
diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c
@@ -1795,12 +1795,15 @@ static int __tty_open(struct inode *inode, struct file *filp)
 	}
 #endif
 	if (device == MKDEV(TTYAUX_MAJOR, 1)) {
-		driver = tty_driver_kref_get(console_device(&index));
-		if (driver) {
-			/* Don't let /dev/console block */
-			filp->f_flags |= O_NONBLOCK;
-			noctty = 1;
-			goto got_driver;
+		struct tty_driver *console_driver = console_device(&index);
+		if (console_driver) {
+			driver = tty_driver_kref_get(console_driver);
+			if (driver) {
+				/* Don't let /dev/console block */
+				filp->f_flags |= O_NONBLOCK;
+				noctty = 1;
+				goto got_driver;
+			}
 		}
 		mutex_unlock(&tty_mutex);
 		return -ENODEV;