diff options
| -rw-r--r-- | drivers/tty/serial/8250/8250_dw.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index 4658e3e0ec42..5f096c74da7e 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c | |||
| @@ -96,7 +96,8 @@ static void dw8250_serial_out(struct uart_port *p, int offset, int value) | |||
| 96 | if (offset == UART_LCR) { | 96 | if (offset == UART_LCR) { |
| 97 | int tries = 1000; | 97 | int tries = 1000; |
| 98 | while (tries--) { | 98 | while (tries--) { |
| 99 | if (value == p->serial_in(p, UART_LCR)) | 99 | unsigned int lcr = p->serial_in(p, UART_LCR); |
| 100 | if ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR)) | ||
| 100 | return; | 101 | return; |
| 101 | dw8250_force_idle(p); | 102 | dw8250_force_idle(p); |
| 102 | writeb(value, p->membase + (UART_LCR << p->regshift)); | 103 | writeb(value, p->membase + (UART_LCR << p->regshift)); |
| @@ -132,7 +133,8 @@ static void dw8250_serial_out32(struct uart_port *p, int offset, int value) | |||
| 132 | if (offset == UART_LCR) { | 133 | if (offset == UART_LCR) { |
| 133 | int tries = 1000; | 134 | int tries = 1000; |
| 134 | while (tries--) { | 135 | while (tries--) { |
| 135 | if (value == p->serial_in(p, UART_LCR)) | 136 | unsigned int lcr = p->serial_in(p, UART_LCR); |
| 137 | if ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR)) | ||
| 136 | return; | 138 | return; |
| 137 | dw8250_force_idle(p); | 139 | dw8250_force_idle(p); |
| 138 | writel(value, p->membase + (UART_LCR << p->regshift)); | 140 | writel(value, p->membase + (UART_LCR << p->regshift)); |