summaryrefslogtreecommitdiff
path: root/drivers/tty/tty_buffer.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-04-30 12:22:17 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-10 20:04:18 +0300
commite16cb0a72fc291847adf10ec26b7879c69f12327 (patch)
tree872a013386bde5e31b9c7e157bc5d52516dd5692 /drivers/tty/tty_buffer.c
parent485e148d11829025b9195cc8baf0ab6cc6a19558 (diff)
downloadlinux-e16cb0a72fc291847adf10ec26b7879c69f12327.tar.xz
tty: 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>
Diffstat (limited to 'drivers/tty/tty_buffer.c')
-rw-r--r--drivers/tty/tty_buffer.c3
1 files changed, 2 insertions, 1 deletions
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;