aboutsummaryrefslogtreecommitdiffstats
path: root/net/irda/ircomm/ircomm_tty.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/irda/ircomm/ircomm_tty.c')
-rw-r--r--net/irda/ircomm/ircomm_tty.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index 4e35b45c1c73..7a0d6115d06f 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -292,7 +292,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
292 return 0; 292 return 0;
293 } 293 }
294 294
295 if (tty->termios->c_cflag & CLOCAL) { 295 if (tty->termios.c_cflag & CLOCAL) {
296 IRDA_DEBUG(1, "%s(), doing CLOCAL!\n", __func__ ); 296 IRDA_DEBUG(1, "%s(), doing CLOCAL!\n", __func__ );
297 do_clocal = 1; 297 do_clocal = 1;
298 } 298 }
@@ -319,7 +319,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
319 port->blocked_open++; 319 port->blocked_open++;
320 320
321 while (1) { 321 while (1) {
322 if (tty->termios->c_cflag & CBAUD) 322 if (tty->termios.c_cflag & CBAUD)
323 tty_port_raise_dtr_rts(port); 323 tty_port_raise_dtr_rts(port);
324 324
325 current->state = TASK_INTERRUPTIBLE; 325 current->state = TASK_INTERRUPTIBLE;
@@ -421,8 +421,8 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
421 * 421 *
422 * Note this is completely usafe and doesn't work properly 422 * Note this is completely usafe and doesn't work properly
423 */ 423 */
424 tty->termios->c_iflag = 0; 424 tty->termios.c_iflag = 0;
425 tty->termios->c_oflag = 0; 425 tty->termios.c_oflag = 0;
426 426
427 /* Insert into hash */ 427 /* Insert into hash */
428 /* FIXME there is a window from find to here */ 428 /* FIXME there is a window from find to here */
@@ -842,7 +842,7 @@ static void ircomm_tty_throttle(struct tty_struct *tty)
842 ircomm_tty_send_xchar(tty, STOP_CHAR(tty)); 842 ircomm_tty_send_xchar(tty, STOP_CHAR(tty));
843 843
844 /* Hardware flow control? */ 844 /* Hardware flow control? */
845 if (tty->termios->c_cflag & CRTSCTS) { 845 if (tty->termios.c_cflag & CRTSCTS) {
846 self->settings.dte &= ~IRCOMM_RTS; 846 self->settings.dte &= ~IRCOMM_RTS;
847 self->settings.dte |= IRCOMM_DELTA_RTS; 847 self->settings.dte |= IRCOMM_DELTA_RTS;
848 848
@@ -874,7 +874,7 @@ static void ircomm_tty_unthrottle(struct tty_struct *tty)
874 } 874 }
875 875
876 /* Using hardware flow control? */ 876 /* Using hardware flow control? */
877 if (tty->termios->c_cflag & CRTSCTS) { 877 if (tty->termios.c_cflag & CRTSCTS) {
878 self->settings.dte |= (IRCOMM_RTS|IRCOMM_DELTA_RTS); 878 self->settings.dte |= (IRCOMM_RTS|IRCOMM_DELTA_RTS);
879 879
880 ircomm_param_request(self, IRCOMM_DTE, TRUE); 880 ircomm_param_request(self, IRCOMM_DTE, TRUE);