From 4365bd276424f7ec92fc07a433dc5b4d2dcfa35d Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Mon, 1 Dec 2008 11:36:06 +0000
Subject: [PATCH] --- yaml --- r: 119487 b: refs/heads/master c:
 296fa7f6a3f3342d40df7713e74246198295654b h: refs/heads/master i:   119485:
 04b71ea20971027af8fc7b84d480e4552566d790   119483:
 c6681da5493400f1225e56e7f2f8d18b4ad214c0   119479:
 2516c54b2b28759fca6ab4750ec81949f4e1b696   119471:
 5b4a83cdfbe4bcdaa85bea1c00a62c9af8a853bc   119455:
 a80854b6716f32cd0705fb846b86e0ba9cd56aad   119423:
 66b6d2521b4ee20dd32675a2c1dd21e00064b682 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/char/tty_io.c | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 8ad2f73e99ff..706653b80095 100644
--- 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
index 59f472143f08..1412a8d1e58d 100644
--- 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;