[PATCH 1/5] um: port: Move an assignment for the variable "fd" in port_wait()

SF Markus Elfring
2017-01-18T21:56:17Z

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 18 Jan 2017 21:40:29 +0100

A local variable was set to an error code in one case before a concrete
error situation was detected. Thus move the corresponding assignment into
an if branch to indicate a software failure there.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
arch/um/drivers/port_kern.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c
index 40ca5cc275e9..b2bbda21c5f3 100644
--- a/arch/um/drivers/port_kern.c
+++ b/arch/um/drivers/port_kern.c
@@ -230,10 +230,10 @@ int port_wait(void *data)

atomic_inc(&port->wait_count);
while (1) {
- fd = -ERESTARTSYS;
- if (wait_for_completion_interruptible(&port->done))
+ if (wait_for_completion_interruptible(&port->done)) {
+ fd = -ERESTARTSYS;
goto out;
-
+ }
spin_lock(&port->lock);

conn = list_entry(port->connections.next, struct connection,
--
2.11.0