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