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 /0015-tty_ldsem.c-move-assignment-out-of-if-block.patch | |
| parent | 71c7e32cd1509d46be836ed19dfe63e217eae8d4 (diff) | |
| download | patches-24b1c251dfcd02877c40d7e52288c9bc2dc7ff35.tar.gz | |
updates and new patches
Diffstat (limited to '0015-tty_ldsem.c-move-assignment-out-of-if-block.patch')
| -rw-r--r-- | 0015-tty_ldsem.c-move-assignment-out-of-if-block.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/0015-tty_ldsem.c-move-assignment-out-of-if-block.patch b/0015-tty_ldsem.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..680bc131fd7269 --- /dev/null +++ b/0015-tty_ldsem.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,33 @@ +From d87ee8fe3fa67484312b43aed924a469611e39a4 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 15/36] 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> +--- + drivers/tty/tty_ldsem.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +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; + } + +-- +2.3.7 + |