aboutsummaryrefslogtreecommitdiff
path: root/drivers/tty/serial/8250/8250_pci1xxxx.c
diff options
context:
space:
mode:
authorGravatar Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2024-02-04 06:21:02 -0800
committerGravatar Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2024-02-04 06:21:02 -0800
commita802f50d6e92298d44a806d326a2ba3eefa6db72 (patch)
tree40cafff98f5248d0121656fc538e65dc9baa64b2 /drivers/tty/serial/8250/8250_pci1xxxx.c
parenttty: serial: uartps: Add rs485 support to uartps driver (diff)
parentLinux 6.8-rc3 (diff)
downloadlinux-a802f50d6e92298d44a806d326a2ba3eefa6db72.tar.gz
linux-a802f50d6e92298d44a806d326a2ba3eefa6db72.tar.bz2
linux-a802f50d6e92298d44a806d326a2ba3eefa6db72.zip
Merge 6.8-rc3 into tty-next
We need the tty/serial fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/8250/8250_pci1xxxx.c')
-rw-r--r--drivers/tty/serial/8250/8250_pci1xxxx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/8250/8250_pci1xxxx.c b/drivers/tty/serial/8250/8250_pci1xxxx.c
index 6cfeba058dba..5cf0580f21cd 100644
--- a/drivers/tty/serial/8250/8250_pci1xxxx.c
+++ b/drivers/tty/serial/8250/8250_pci1xxxx.c
@@ -330,7 +330,7 @@ static void pci1xxxx_process_read_data(struct uart_port *port,
* to read, the data is received one byte at a time.
*/
while (valid_burst_count--) {
- if (*buff_index > (RX_BUF_SIZE - UART_BURST_SIZE))
+ if (*buff_index >= (RX_BUF_SIZE - UART_BURST_SIZE))
break;
burst_buf = (u32 *)&rx_buff[*buff_index];
*burst_buf = readl(port->membase + UART_RX_BURST_FIFO);
@@ -339,7 +339,7 @@ static void pci1xxxx_process_read_data(struct uart_port *port,
}
while (*valid_byte_count) {
- if (*buff_index > RX_BUF_SIZE)
+ if (*buff_index >= RX_BUF_SIZE)
break;
rx_buff[*buff_index] = readb(port->membase +
UART_RX_BYTE_FIFO);