diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-29 16:24:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-29 16:24:28 +0200 |
| commit | 24b1c251dfcd02877c40d7e52288c9bc2dc7ff35 (patch) | |
| tree | 8fb3d4332168686f601f58b23815910799b1699f /0003-hvc_console.c-move-assignment-out-of-if-block.patch | |
| parent | 71c7e32cd1509d46be836ed19dfe63e217eae8d4 (diff) | |
| download | patches-24b1c251dfcd02877c40d7e52288c9bc2dc7ff35.tar.gz | |
updates and new patches
Diffstat (limited to '0003-hvc_console.c-move-assignment-out-of-if-block.patch')
| -rw-r--r-- | 0003-hvc_console.c-move-assignment-out-of-if-block.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/0003-hvc_console.c-move-assignment-out-of-if-block.patch b/0003-hvc_console.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..51993ca386d9d2 --- /dev/null +++ b/0003-hvc_console.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,35 @@ +From 653778364ba17237ea794ab00e92ed04b98aec42 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:02 +0200 +Subject: [PATCH 03/36] hvc_console.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> +CC: Tomoki Sekiyama <tomoki.sekiyama@hds.com> +CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/tty/hvc/hvc_console.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c +index 4fcec1d793a7..4e9c4cc9e1b5 100644 +--- a/drivers/tty/hvc/hvc_console.c ++++ b/drivers/tty/hvc/hvc_console.c +@@ -319,7 +319,8 @@ static int hvc_install(struct tty_driver *driver, struct tty_struct *tty) + int rc; + + /* Auto increments kref reference if found. */ +- if (!(hp = hvc_get_by_index(tty->index))) ++ hp = hvc_get_by_index(tty->index); ++ if (!hp) + return -ENODEV; + + tty->driver_data = hp; +-- +2.3.7 + |