tty: tty_buffer.c: move assignment out of if () block
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Apr 2015 09:22:17 +0000 (11:22 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 10 May 2015 17:04:18 +0000 (19:04 +0200)
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

index 7566164..5b2b0ff 100644 (file)
@@ -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;