summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-04-30 11:22:18 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-10 19:04:18 +0200
commitf9ce5ccfd97a61ed318eb52cbb358f1aa826d82f (patch)
tree191e32fc1674697cf6f4125819c07b715189a622 /drivers/tty
parenttty: tty_buffer.c: move assignment out of if () block (diff)
downloadlinux-f9ce5ccfd97a61ed318eb52cbb358f1aa826d82f.tar.xz
linux-f9ce5ccfd97a61ed318eb52cbb358f1aa826d82f.zip
tty: tty_ldsem.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')
-rw-r--r--drivers/tty/tty_ldsem.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/tty_ldsem.c b/drivers/tty/tty_ldsem.c
index 0ffb0cbe2823..ad7eba5ca380 100644
--- a/drivers/tty/tty_ldsem.c
+++ b/drivers/tty/tty_ldsem.c
@@ -299,7 +299,8 @@ down_write_failed(struct ld_semaphore *sem, long count, long timeout)
timeout = schedule_timeout(timeout);
raw_spin_lock_irq(&sem->wait_lock);
set_task_state(tsk, TASK_UNINTERRUPTIBLE);
- if ((locked = writer_trylock(sem)))
+ locked = writer_trylock(sem);
+ if (locked)
break;
}