Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 175311
b: refs/heads/master
c: cead486
h: refs/heads/master
i:
  175309: d590458
  175307: 09f4c16
  175303: edd37c0
  175295: 9f4303b
v: v3
  • Loading branch information
Breno Leitão authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent 992287f commit 46bc886
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a53568a22adf6881183096d0863b0ff301173cbd
refs/heads/master: cead486f407bbf152feccfe3734dd3966f9ff166
2 changes: 0 additions & 2 deletions trunk/drivers/serial/jsm/jsm.h
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,6 @@ struct jsm_channel {
u8 ch_stopc; /* Stop character */
u8 ch_startc; /* Start character */

u32 ch_old_baud; /* Cache of the current baud */

u32 ch_wopen; /* Waiting for open process cnt */

u8 ch_mostat; /* FEP output modem status */
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/serial/jsm/jsm_neo.c
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,6 @@ static void neo_param(struct jsm_channel *ch)
ch->ch_flags |= (CH_BAUD0);
ch->ch_mostat &= ~(UART_MCR_RTS | UART_MCR_DTR);
neo_assert_modem_signals(ch);
ch->ch_old_baud = 0;
return;

} else {
Expand Down Expand Up @@ -1041,7 +1040,6 @@ static void neo_param(struct jsm_channel *ch)
quot = ch->ch_bd->bd_dividend / baud;

if (quot != 0) {
ch->ch_old_baud = baud;
writeb(UART_LCR_DLAB, &ch->ch_neo_uart->lcr);
writeb((quot & 0xff), &ch->ch_neo_uart->txrx);
writeb((quot >> 8), &ch->ch_neo_uart->ier);
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/serial/jsm/jsm_tty.c
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,6 @@ static void jsm_tty_close(struct uart_port *port)
bd->bd_ops->assert_modem_signals(channel);
}

channel->ch_old_baud = 0;

/* Turn off UART interrupts for this port */
channel->ch_bd->bd_ops->uart_off(channel);

Expand Down

0 comments on commit 46bc886

Please sign in to comment.