diff options
Diffstat (limited to 'drivers/serial/jsm/jsm_neo.c')
-rw-r--r-- | drivers/serial/jsm/jsm_neo.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c index e6390d023634..9dadaa11d266 100644 --- a/drivers/serial/jsm/jsm_neo.c +++ b/drivers/serial/jsm/jsm_neo.c | |||
@@ -533,7 +533,6 @@ static void neo_copy_data_from_queue_to_uart(struct jsm_channel *ch) | |||
533 | if (!(ch->ch_flags & (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM))) | 533 | if (!(ch->ch_flags & (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM))) |
534 | return; | 534 | return; |
535 | 535 | ||
536 | len_written = 0; | ||
537 | n = UART_17158_TX_FIFOSIZE - ch->ch_t_tlevel; | 536 | n = UART_17158_TX_FIFOSIZE - ch->ch_t_tlevel; |
538 | 537 | ||
539 | /* cache head and tail of queue */ | 538 | /* cache head and tail of queue */ |
@@ -619,14 +618,10 @@ static void neo_parse_modem(struct jsm_channel *ch, u8 signals) | |||
619 | /* Make the UART raise any of the output signals we want up */ | 618 | /* Make the UART raise any of the output signals we want up */ |
620 | static void neo_assert_modem_signals(struct jsm_channel *ch) | 619 | static void neo_assert_modem_signals(struct jsm_channel *ch) |
621 | { | 620 | { |
622 | u8 out; | ||
623 | |||
624 | if (!ch) | 621 | if (!ch) |
625 | return; | 622 | return; |
626 | 623 | ||
627 | out = ch->ch_mostat; | 624 | writeb(ch->ch_mostat, &ch->ch_neo_uart->mcr); |
628 | |||
629 | writeb(out, &ch->ch_neo_uart->mcr); | ||
630 | 625 | ||
631 | /* flush write operation */ | 626 | /* flush write operation */ |
632 | neo_pci_posting_flush(ch->ch_bd); | 627 | neo_pci_posting_flush(ch->ch_bd); |
@@ -936,10 +931,9 @@ static inline void neo_parse_lsr(struct jsm_board *brd, u32 port) | |||
936 | static void neo_param(struct jsm_channel *ch) | 931 | static void neo_param(struct jsm_channel *ch) |
937 | { | 932 | { |
938 | u8 lcr = 0; | 933 | u8 lcr = 0; |
939 | u8 uart_lcr = 0; | 934 | u8 uart_lcr, ier; |
940 | u8 ier = 0; | 935 | u32 baud; |
941 | u32 baud = 9600; | 936 | int quot; |
942 | int quot = 0; | ||
943 | struct jsm_board *bd; | 937 | struct jsm_board *bd; |
944 | 938 | ||
945 | bd = ch->ch_bd; | 939 | bd = ch->ch_bd; |