diff options
Diffstat (limited to 'drivers/serial/jsm/jsm_neo.c')
| -rw-r--r-- | drivers/serial/jsm/jsm_neo.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c index b4b124e4828f..7960d9633c15 100644 --- a/drivers/serial/jsm/jsm_neo.c +++ b/drivers/serial/jsm/jsm_neo.c | |||
| @@ -954,13 +954,8 @@ static void neo_param(struct jsm_channel *ch) | |||
| 954 | ch->ch_flags |= (CH_BAUD0); | 954 | ch->ch_flags |= (CH_BAUD0); |
| 955 | ch->ch_mostat &= ~(UART_MCR_RTS | UART_MCR_DTR); | 955 | ch->ch_mostat &= ~(UART_MCR_RTS | UART_MCR_DTR); |
| 956 | neo_assert_modem_signals(ch); | 956 | neo_assert_modem_signals(ch); |
| 957 | ch->ch_old_baud = 0; | ||
| 958 | return; | 957 | return; |
| 959 | 958 | ||
| 960 | } else if (ch->ch_custom_speed) { | ||
| 961 | baud = ch->ch_custom_speed; | ||
| 962 | if (ch->ch_flags & CH_BAUD0) | ||
| 963 | ch->ch_flags &= ~(CH_BAUD0); | ||
| 964 | } else { | 959 | } else { |
| 965 | int i; | 960 | int i; |
| 966 | unsigned int cflag; | 961 | unsigned int cflag; |
| @@ -1045,7 +1040,6 @@ static void neo_param(struct jsm_channel *ch) | |||
| 1045 | quot = ch->ch_bd->bd_dividend / baud; | 1040 | quot = ch->ch_bd->bd_dividend / baud; |
| 1046 | 1041 | ||
| 1047 | if (quot != 0) { | 1042 | if (quot != 0) { |
| 1048 | ch->ch_old_baud = baud; | ||
| 1049 | writeb(UART_LCR_DLAB, &ch->ch_neo_uart->lcr); | 1043 | writeb(UART_LCR_DLAB, &ch->ch_neo_uart->lcr); |
| 1050 | writeb((quot & 0xff), &ch->ch_neo_uart->txrx); | 1044 | writeb((quot & 0xff), &ch->ch_neo_uart->txrx); |
| 1051 | writeb((quot >> 8), &ch->ch_neo_uart->ier); | 1045 | writeb((quot >> 8), &ch->ch_neo_uart->ier); |
| @@ -1123,8 +1117,6 @@ static irqreturn_t neo_intr(int irq, void *voidbrd) | |||
| 1123 | unsigned long lock_flags2; | 1117 | unsigned long lock_flags2; |
| 1124 | int outofloop_count = 0; | 1118 | int outofloop_count = 0; |
| 1125 | 1119 | ||
| 1126 | brd->intr_count++; | ||
| 1127 | |||
| 1128 | /* Lock out the slow poller from running on this board. */ | 1120 | /* Lock out the slow poller from running on this board. */ |
| 1129 | spin_lock_irqsave(&brd->bd_intr_lock, lock_flags); | 1121 | spin_lock_irqsave(&brd->bd_intr_lock, lock_flags); |
| 1130 | 1122 | ||
