OSDN Git Service

serial: qcom_geni: Fix variable naming
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Mon, 23 Jan 2023 17:38:56 +0000 (19:38 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Jan 2023 17:51:50 +0000 (18:51 +0100)
Commit 2aaa43c70778 ("tty: serial: qcom-geni-serial: add support for
serial engine DMA") renamed rx_fifo member to rf_buf which caused a
build failure when b8caf69a6946 ("tty: serial: qcom-geni-serial: fix
slab-out-of-bounds on RX FIFO buffer") from tty-linus was merged into
tty-next.

Fix the member variable name.

Fixes: 7a6aa989f2e8 ("Merge 6.2-rc5 into tty-next")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20230123173857.40695-2-ilpo.jarvinen@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/qcom_geni_serial.c

index d98e0a8..7c49194 100644 (file)
@@ -1055,11 +1055,11 @@ static int setup_fifos(struct qcom_geni_serial_port *port)
        uport->fifosize =
                (port->tx_fifo_depth * port->tx_fifo_width) / BITS_PER_BYTE;
 
-       if (port->rx_fifo && (old_rx_fifo_depth != port->rx_fifo_depth) && port->rx_fifo_depth) {
-               port->rx_fifo = devm_krealloc(uport->dev, port->rx_fifo,
-                                             port->rx_fifo_depth * sizeof(u32),
-                                             GFP_KERNEL);
-               if (!port->rx_fifo)
+       if (port->rx_buf && (old_rx_fifo_depth != port->rx_fifo_depth) && port->rx_fifo_depth) {
+               port->rx_buf = devm_krealloc(uport->dev, port->rx_buf,
+                                            port->rx_fifo_depth * sizeof(u32),
+                                            GFP_KERNEL);
+               if (!port->rx_buf)
                        return -ENOMEM;
        }