tty: Remove ASYNC_CLOSING checks in open()/hangup() methods

[cascardo/linux.git] / drivers / tty / synclinkmp.c

diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index 08633a8..fb00a06 100644 (file)
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -752,15 +752,6 @@ static int open(struct tty_struct *tty, struct file *filp)
                printk("%s(%d):%s open(), old ref count = %d\n",
                         __FILE__,__LINE__,tty->driver->name, info->port.count);
 
-       /* If port is closing, signal caller to try again */
-       if (info->port.flags & ASYNC_CLOSING){
-               wait_event_interruptible_tty(tty, info->port.close_wait,
-                                            !(info->port.flags & ASYNC_CLOSING));
-               retval = ((info->port.flags & ASYNC_HUP_NOTIFY) ?
-                       -EAGAIN : -ERESTARTSYS);
-               goto cleanup;
-       }
-
        info->port.low_latency = (info->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 
        spin_lock_irqsave(&info->netlock, flags);
@@ -3341,9 +3332,8 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                }
 
                cd = tty_port_carrier_raised(port);
-
-               if (!(port->flags & ASYNC_CLOSING) && (do_clocal || cd))
-                       break;
+               if (do_clocal || cd)
+                       break;
 
                if (signal_pending(current)) {
                        retval = -ERESTARTSYS;