diff options
Diffstat (limited to '0005-68328serial.c-move-assignment-out-of-if-block.patch')
| -rw-r--r-- | 0005-68328serial.c-move-assignment-out-of-if-block.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/0005-68328serial.c-move-assignment-out-of-if-block.patch b/0005-68328serial.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..bbab820af0c814 --- /dev/null +++ b/0005-68328serial.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,33 @@ +From 5ce8eba21f28738d0fb9359897d893efd99c1c50 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:05 +0200 +Subject: [PATCH 05/36] 68328serial.c: move assignment out of if () block + +We should not be doing assignments within an if () block +so fix up the code to not do this. + +change was created using Coccinelle. + +CC: Jiri Slaby <jslaby@suse.cz> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/tty/serial/68328serial.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c +index 5dc9c4bfa66e..748c18f8c8cd 100644 +--- a/drivers/tty/serial/68328serial.c ++++ b/drivers/tty/serial/68328serial.c +@@ -508,7 +508,8 @@ static void change_speed(struct m68k_serial *info, struct tty_struct *tty) + int i; + + cflag = tty->termios.c_cflag; +- if (!(port = info->port)) ++ port = info->port; ++ if (!port) + return; + + ustcnt = uart->ustcnt; +-- +2.3.7 + |