1 files changed, 4 insertions, 9 deletions

diff --git a/net/irda/ircomm/ircomm_tty_ioctl.c b/net/irda/ircomm/ircomm_tty_ioctl.c
index 75ccdbd0728e..d3687aaa23de 100644
--- a/net/irda/ircomm/ircomm_tty_ioctl.c
+++ b/net/irda/ircomm/ircomm_tty_ioctl.c
@@ -158,26 +158,21 @@ void ircomm_tty_set_termios(struct tty_struct *tty,
         ircomm_tty_change_speed(self, tty);
 
         /* Handle transition to B0 status */
-        if ((old_termios->c_cflag & CBAUD) &&
-            !(cflag & CBAUD)) {
+        if ((old_termios->c_cflag & CBAUD) && !(cflag & CBAUD)) {
                 self->settings.dte &= ~(IRCOMM_DTR|IRCOMM_RTS);
                 ircomm_param_request(self, IRCOMM_DTE, TRUE);
         }
 
         /* Handle transition away from B0 status */
-        if (!(old_termios->c_cflag & CBAUD) &&
-            (cflag & CBAUD)) {
+        if (!(old_termios->c_cflag & CBAUD) && (cflag & CBAUD)) {
                 self->settings.dte |= IRCOMM_DTR;
-                if (!(tty->termios.c_cflag & CRTSCTS) ||
-                    !test_bit(TTY_THROTTLED, &tty->flags)) {
+                if (!C_CRTSCTS(tty) || !test_bit(TTY_THROTTLED, &tty->flags))
                         self->settings.dte |= IRCOMM_RTS;
-                }
                 ircomm_param_request(self, IRCOMM_DTE, TRUE);
         }
 
         /* Handle turning off CRTSCTS */
-        if ((old_termios->c_cflag & CRTSCTS) &&
-            !(tty->termios.c_cflag & CRTSCTS))
+        if ((old_termios->c_cflag & CRTSCTS) && !C_CRTSCTS(tty))
         {
                 tty->hw_stopped = 0;
                 ircomm_tty_start(tty);