Home Home > GIT Browse > SLE12-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-16 16:19:33 +0200
committerTakashi Iwai <tiwai@suse.de>2019-07-16 16:19:35 +0200
commitb1b67be7e4f21ae125444ba93d2f37f979500604 (patch)
tree2319b4a39939e8cf0933ae61e23d6d231564f03a
parent17fe5b0085b875d1fff26cdc32683cd14954b73d (diff)
serial: uartps: Fix multiple line dereference (bsc#1051510).
-rw-r--r--patches.drivers/serial-uartps-Fix-multiple-line-dereference.patch41
-rw-r--r--series.conf1
2 files changed, 42 insertions, 0 deletions
diff --git a/patches.drivers/serial-uartps-Fix-multiple-line-dereference.patch b/patches.drivers/serial-uartps-Fix-multiple-line-dereference.patch
new file mode 100644
index 0000000000..44f37e3518
--- /dev/null
+++ b/patches.drivers/serial-uartps-Fix-multiple-line-dereference.patch
@@ -0,0 +1,41 @@
+From b6415f243919703c97483a29ff918872f66f165c Mon Sep 17 00:00:00 2001
+From: Nava kishore Manne <nava.manne@xilinx.com>
+Date: Wed, 12 Jun 2019 13:14:40 +0200
+Subject: [PATCH] serial: uartps: Fix multiple line dereference
+Git-commit: b6415f243919703c97483a29ff918872f66f165c
+Patch-mainline: v5.3-rc1
+References: bsc#1051510
+
+Trivial patch which fixes this checkpatch warning:
+Warning: Avoid multiple line dereference - prefer 'port->state->xmit.tail'
++ port->state->xmit.buf[port->state->xmit.
++ tail], port->membase + CDNS_UART_FIFO);
+
+Fixes: c8dbdc842d30 ("serial: xuartps: Rewrite the interrupt handling logic")
+Signed-off-by: Nava kishore Manne <nava.manne@xilinx.com>
+Signed-off-by: Michal Simek <michal.simek@xilinx.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/tty/serial/xilinx_uartps.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
+index 32cf67598bc3..2dff879f988e 100644
+--- a/drivers/tty/serial/xilinx_uartps.c
++++ b/drivers/tty/serial/xilinx_uartps.c
+@@ -321,8 +321,8 @@ static void cdns_uart_handle_tx(void *dev_id)
+ * register.
+ */
+ writel(
+- port->state->xmit.buf[port->state->xmit.
+- tail], port->membase + CDNS_UART_FIFO);
++ port->state->xmit.buf[port->state->xmit.tail],
++ port->membase + CDNS_UART_FIFO);
+
+ port->icount.tx++;
+
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 31bc2bc8f3..813bab593b 100644
--- a/series.conf
+++ b/series.conf
@@ -22911,6 +22911,7 @@
patches.drivers/staging-rtl8712-reduce-stack-usage-again.patch
patches.drivers/staging-comedi-amplc_pci230-fix-null-pointer-deref-o.patch
patches.drivers/staging-comedi-dt282x-fix-a-null-pointer-deref-on-in.patch
+ patches.drivers/serial-uartps-Fix-multiple-line-dereference.patch
patches.drivers/memstick-Fix-error-cleanup-path-of-memstick_init.patch
patches.fixes/0001-ocfs2-add-last-unlock-times-in-locking_state.patch
patches.fixes/0002-ocfs2-add-locking-filter-debugfs-file.patch