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 /0014-tty_buffer.c-move-assignment-out-of-if-block.patch | |
| parent | 71c7e32cd1509d46be836ed19dfe63e217eae8d4 (diff) | |
| download | patches-24b1c251dfcd02877c40d7e52288c9bc2dc7ff35.tar.gz | |
updates and new patches
Diffstat (limited to '0014-tty_buffer.c-move-assignment-out-of-if-block.patch')
| -rw-r--r-- | 0014-tty_buffer.c-move-assignment-out-of-if-block.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/0014-tty_buffer.c-move-assignment-out-of-if-block.patch b/0014-tty_buffer.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..18ee77fa038c3d --- /dev/null +++ b/0014-tty_buffer.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,33 @@ +From dcf24946ecbcdc07ef7fe3cdd2d7c8bde0dc7ee4 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:09 +0200 +Subject: [PATCH 14/36] tty_buffer.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/tty_buffer.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/tty/tty_buffer.c b/drivers/tty/tty_buffer.c +index 75661641f5fe..5b2b0ffdde28 100644 +--- a/drivers/tty/tty_buffer.c ++++ b/drivers/tty/tty_buffer.c +@@ -262,7 +262,8 @@ static int __tty_buffer_request_room(struct tty_port *port, size_t size, + change = (b->flags & TTYB_NORMAL) && (~flags & TTYB_NORMAL); + if (change || left < size) { + /* This is the slow path - looking for new buffers to use */ +- if ((n = tty_buffer_alloc(port, size)) != NULL) { ++ n = tty_buffer_alloc(port, size); ++ if (n != NULL) { + n->flags = flags; + buf->tail = n; + b->commit = b->used; +-- +2.3.7 + |