From bb256890c963a56ac0f2b8a1ce5f1da7ea029959 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Wed, 9 Nov 2011 21:33:22 +0100
Subject: [PATCH] --- yaml --- r: 280664 b: refs/heads/master c:
 2cd0050cf3ec4da847c3a2f7d95cffd548aef39d h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/tty/tty_io.c | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index ca11eeaeb1f6..4f00ce35ebca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba5db44895ec3abc5317a9af86001e688a72185c
+refs/heads/master: 2cd0050cf3ec4da847c3a2f7d95cffd548aef39d
diff --git a/trunk/drivers/tty/tty_io.c b/trunk/drivers/tty/tty_io.c
index ba9194e7b9c8..76e66ff5e65d 100644
--- a/trunk/drivers/tty/tty_io.c
+++ b/trunk/drivers/tty/tty_io.c
@@ -1841,16 +1841,17 @@ static struct tty_driver *tty_lookup_driver(dev_t device, struct file *filp,
 {
 	struct tty_driver *driver;
 
+	switch (device) {
 #ifdef CONFIG_VT
-	if (device == MKDEV(TTY_MAJOR, 0)) {
+	case MKDEV(TTY_MAJOR, 0): {
 		extern struct tty_driver *console_driver;
 		driver = tty_driver_kref_get(console_driver);
 		*index = fg_console;
 		*noctty = 1;
-		return driver;
+		break;
 	}
 #endif
-	if (device == MKDEV(TTYAUX_MAJOR, 1)) {
+	case MKDEV(TTYAUX_MAJOR, 1): {
 		struct tty_driver *console_driver = console_device(index);
 		if (console_driver) {
 			driver = tty_driver_kref_get(console_driver);
@@ -1858,15 +1859,17 @@ static struct tty_driver *tty_lookup_driver(dev_t device, struct file *filp,
 				/* Don't let /dev/console block */
 				filp->f_flags |= O_NONBLOCK;
 				*noctty = 1;
-				return driver;
+				break;
 			}
 		}
 		return ERR_PTR(-ENODEV);
 	}
-
-	driver = get_tty_driver(device, index);
-	if (!driver)
-		return ERR_PTR(-ENODEV);
+	default:
+		driver = get_tty_driver(device, index);
+		if (!driver)
+			return ERR_PTR(-ENODEV);
+		break;
+	}
 	return driver;
 }