tty: hvcs.c: move assignment out of if () block
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Apr 2015 09:22:09 +0000 (11:22 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 10 May 2015 17:04:17 +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>
CC: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/hvc/hvcs.c

index 81ff7e1bfb1a82ac68dd33d760b84f7edff4e9b8..f7ff97c0ad3499677578b7d1b68ff65c11ab74ec 100644 (file)
@@ -1044,8 +1044,8 @@ static int hvcs_enable_device(struct hvcs_struct *hvcsd, uint32_t unit_address,
         * It is possible that the vty-server was removed between the time that
         * the conn was registered and now.
         */
-       if (!(rc = request_irq(irq, &hvcs_handle_interrupt,
-                               0, "ibmhvcs", hvcsd))) {
+       rc = request_irq(irq, &hvcs_handle_interrupt, 0, "ibmhvcs", hvcsd);
+       if (!rc) {
                /*
                 * It is possible the vty-server was removed after the irq was
                 * requested but before we have time to enable interrupts.