| .. | .. |
|---|
| 873 | 873 | |
|---|
| 874 | 874 | port->icount.tx += atmel_port->tx_len; |
|---|
| 875 | 875 | |
|---|
| 876 | | - spin_lock_irq(&atmel_port->lock_tx); |
|---|
| 876 | + spin_lock(&atmel_port->lock_tx); |
|---|
| 877 | 877 | async_tx_ack(atmel_port->desc_tx); |
|---|
| 878 | 878 | atmel_port->cookie_tx = -EINVAL; |
|---|
| 879 | 879 | atmel_port->desc_tx = NULL; |
|---|
| 880 | | - spin_unlock_irq(&atmel_port->lock_tx); |
|---|
| 880 | + spin_unlock(&atmel_port->lock_tx); |
|---|
| 881 | 881 | |
|---|
| 882 | 882 | if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) |
|---|
| 883 | 883 | uart_write_wakeup(port); |
|---|
| .. | .. |
|---|
| 2633 | 2633 | else if (mr == ATMEL_US_PAR_ODD) |
|---|
| 2634 | 2634 | *parity = 'o'; |
|---|
| 2635 | 2635 | |
|---|
| 2636 | | - /* |
|---|
| 2637 | | - * The serial core only rounds down when matching this to a |
|---|
| 2638 | | - * supported baud rate. Make sure we don't end up slightly |
|---|
| 2639 | | - * lower than one of those, as it would make us fall through |
|---|
| 2640 | | - * to a much lower baud rate than we really want. |
|---|
| 2641 | | - */ |
|---|
| 2642 | | - *baud = port->uartclk / (16 * (quot - 1)); |
|---|
| 2636 | + *baud = port->uartclk / (16 * quot); |
|---|
| 2643 | 2637 | } |
|---|
| 2644 | 2638 | |
|---|
| 2645 | 2639 | static int __init atmel_console_setup(struct console *co, char *options) |
|---|