Merge 3.9-rc7 intp tty-next

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / tty / synclink.c

diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
index 8983276aa35e9bf46b1eec4d9e9e45d39d82ef33..8eaf1ab8addb1d30faae7b93a28e532fad6a1cf6 100644 (file)
--- a/drivers/tty/synclink.c
+++ b/drivers/tty/synclink.c
@@ -1058,9 +1058,6 @@ static void mgsl_bh_handler(struct work_struct *work)
                container_of(work, struct mgsl_struct, task);
        int action;
 
-       if (!info)
-               return;
-               
        if ( debug_level >= DEBUG_LEVEL_BH )
                printk( "%s(%d):mgsl_bh_handler(%s) entry\n",
                        __FILE__,__LINE__,info->device_name);
@@ -3311,7 +3308,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
        port->blocked_open++;
        
        while (1) {
-               if (tty->termios.c_cflag & CBAUD)
+               if (C_BAUD(tty) && test_bit(ASYNCB_INITIALIZED, &port->flags))
                        tty_port_raise_dtr_rts(port);
                
                set_current_state(TASK_INTERRUPTIBLE);