hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/drivers/tty/serial/atmel_serial.c
....@@ -873,11 +873,11 @@
873873
874874 port->icount.tx += atmel_port->tx_len;
875875
876
- spin_lock_irq(&atmel_port->lock_tx);
876
+ spin_lock(&atmel_port->lock_tx);
877877 async_tx_ack(atmel_port->desc_tx);
878878 atmel_port->cookie_tx = -EINVAL;
879879 atmel_port->desc_tx = NULL;
880
- spin_unlock_irq(&atmel_port->lock_tx);
880
+ spin_unlock(&atmel_port->lock_tx);
881881
882882 if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
883883 uart_write_wakeup(port);
....@@ -2633,13 +2633,7 @@
26332633 else if (mr == ATMEL_US_PAR_ODD)
26342634 *parity = 'o';
26352635
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);
26432637 }
26442638
26452639 static int __init atmel_console_setup(struct console *co, char *options)