From bf75804837ce64a3367e2d50f656630b079e435e Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Wed, 20 Apr 2011 10:43:16 +0200
Subject: [PATCH] --- yaml --- r: 248671 b: refs/heads/master c:
 32ad3a77b256948a326c3f68db6acaad2b6953e7 h: refs/heads/master i:   248669:
 b201dfcf5539f5c91e1dbe9a716b7f4b35b4291e   248667:
 698ff5db3a3b29d55ec0920531dbd39716e549ca   248663:
 f33c1211134224afbddfcf31f51e7caa46044f2c   248655:
 f19f3f5fa9b834aefe0bc0879ee5587d1421148c   248639:
 97c2811b9e168489e30f2d2f21abe9ff8cf7fb95 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/tty/serial/serial_core.c | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index cfa32d88b8f5..7f201a75e1f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ad7c9af3e1cbb97082062266705d6cb5fb207ee
+refs/heads/master: 32ad3a77b256948a326c3f68db6acaad2b6953e7
diff --git a/trunk/drivers/tty/serial/serial_core.c b/trunk/drivers/tty/serial/serial_core.c
index 55965d5b8143..69d00008f7a3 100644
--- a/trunk/drivers/tty/serial/serial_core.c
+++ b/trunk/drivers/tty/serial/serial_core.c
@@ -1529,15 +1529,6 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
 	BUG_ON(!tty_locked());
 	pr_debug("uart_open(%d) called\n", line);
 
-	/*
-	 * tty->driver->num won't change, so we won't fail here with
-	 * tty->driver_data set to something non-NULL (and therefore
-	 * we won't get caught by uart_close()).
-	 */
-	retval = -ENODEV;
-	if (line >= tty->driver->num)
-		goto fail;
-
 	/*
 	 * We take the semaphore inside uart_get to guarantee that we won't
 	 * be re-entered while allocating the state structure, or while we