Home Home > GIT Browse > SLE15
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:39 +0200
commit8fc48a6fb36e3cf034d95af3549587e43e02ae26 (patch)
tree44b7668e4e2fe1db66b179d8ae5406ce6b9f84e6
parentb1b67be7e4f21ae125444ba93d2f37f979500604 (diff)
serial: uartps: Fix long line over 80 chars (bsc#1051510).
-rw-r--r--patches.drivers/serial-uartps-Fix-long-line-over-80-chars.patch40
-rw-r--r--series.conf1
2 files changed, 41 insertions, 0 deletions
diff --git a/patches.drivers/serial-uartps-Fix-long-line-over-80-chars.patch b/patches.drivers/serial-uartps-Fix-long-line-over-80-chars.patch
new file mode 100644
index 0000000000..23a7e24d05
--- /dev/null
+++ b/patches.drivers/serial-uartps-Fix-long-line-over-80-chars.patch
@@ -0,0 +1,40 @@
+From a53f82d6ccb5199ba4f3b54ae3ff0298ffe1c91d Mon Sep 17 00:00:00 2001
+From: Nava kishore Manne <nava.manne@xilinx.com>
+Date: Wed, 12 Jun 2019 13:14:41 +0200
+Subject: [PATCH] serial: uartps: Fix long line over 80 chars
+Git-commit: a53f82d6ccb5199ba4f3b54ae3ff0298ffe1c91d
+Patch-mainline: v5.3-rc1
+References: bsc#1051510
+
+Trivial patch which fixes one checkpatch warning:
+Warning: line over 80 characters
++ !(readl(port->membase + CDNS_UART_SR)
+ & CDNS_UART_SR_TXFULL)) {
+
+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 | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
+index 2dff879f988e..69ed81d1338b 100644
+--- a/drivers/tty/serial/xilinx_uartps.c
++++ b/drivers/tty/serial/xilinx_uartps.c
+@@ -314,7 +314,8 @@ static void cdns_uart_handle_tx(void *dev_id)
+ } else {
+ numbytes = port->fifosize;
+ while (numbytes && !uart_circ_empty(&port->state->xmit) &&
+- !(readl(port->membase + CDNS_UART_SR) & CDNS_UART_SR_TXFULL)) {
++ !(readl(port->membase + CDNS_UART_SR) &
++ CDNS_UART_SR_TXFULL)) {
+ /*
+ * Get the data from the UART circular buffer
+ * and write it to the cdns_uart's TX_FIFO
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 813bab593b..b0cf577cad 100644
--- a/series.conf
+++ b/series.conf
@@ -22912,6 +22912,7 @@
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/serial-uartps-Fix-long-line-over-80-chars.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