[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1416315480-2053-2-git-send-email-octavian.purdila@intel.com>
Date: Tue, 18 Nov 2014 14:57:57 +0200
From: Octavian Purdila <octavian.purdila@...el.com>
To: lee.jones@...aro.org
Cc: wsa@...-dreams.de, julia.lawall@...6.fr, dan.carpenter@...cle.com,
johan@...nel.org, linux-i2c@...r.kernel.org,
linux-kernel@...r.kernel.org,
Octavian Purdila <octavian.purdila@...el.com>
Subject: [PATCH v2 1/4] mfd: dln2: fix _dln2_transfer return code
If wait_for_completion_interruptible_timeout returns a positive value
it may be propagated as the return value of _dln2_transfer. This
contradicts the documentation of the function and exposes unnecessary
internals to the callers.
This patch makes sure to set the return value to 0 in that case.
Reported-by: Julia Lawall <julia.lawall@...6.fr>
Signed-off-by: Octavian Purdila <octavian.purdila@...el.com>
---
drivers/mfd/dln2.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/mfd/dln2.c b/drivers/mfd/dln2.c
index 9765a17..cf22841 100644
--- a/drivers/mfd/dln2.c
+++ b/drivers/mfd/dln2.c
@@ -462,6 +462,8 @@ static int _dln2_transfer(struct dln2_dev *dln2, u16 handle, u16 cmd,
if (!ret)
ret = -ETIMEDOUT;
goto out_free_rx_slot;
+ } else {
+ ret = 0;
}
if (dln2->disconnect) {
@@ -484,10 +486,8 @@ static int _dln2_transfer(struct dln2_dev *dln2, u16 handle, u16 cmd,
goto out_free_rx_slot;
}
- if (!ibuf) {
- ret = 0;
+ if (!ibuf)
goto out_free_rx_slot;
- }
if (*ibuf_len > rsp->hdr.size - sizeof(*rsp))
*ibuf_len = rsp->hdr.size - sizeof(*rsp);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists