From: Octavian Purdila <octavian.purdila@intel.com>
To: lee.jones@linaro.org
Cc: wsa@the-dreams.de, julia.lawall@lip6.fr,
dan.carpenter@oracle.com, johan@kernel.org,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
Octavian Purdila <octavian.purdila@intel.com>
Subject: [PATCH v2 1/4] mfd: dln2: fix _dln2_transfer return code
Date: Tue, 18 Nov 2014 14:57:57 +0200 [thread overview]
Message-ID: <1416315480-2053-2-git-send-email-octavian.purdila@intel.com> (raw)
In-Reply-To: <1416315480-2053-1-git-send-email-octavian.purdila@intel.com>
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@lip6.fr>
Signed-off-by: Octavian Purdila <octavian.purdila@intel.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
next prev parent reply other threads:[~2014-11-18 12:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-18 12:57 [PATCH v2 0/4] dln2 fixes for ib-mfd-gpio-i2c-3.19 Octavian Purdila
2014-11-18 12:57 ` Octavian Purdila [this message]
2014-11-18 12:57 ` [PATCH v2 2/4] i2c: dln2: simplify return flow for dln2_i2c_enable Octavian Purdila
2014-11-18 12:57 ` [PATCH v2 3/4] mfd: dln2: add a limit check for invalid echo Octavian Purdila
2014-11-18 12:58 ` [PATCH v2 4/4] mfd: dln2: a couple endian fixes Octavian Purdila
[not found] ` <1416315480-2053-1-git-send-email-octavian.purdila-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2014-11-19 17:34 ` [GIT PULL] Immutable branch between MFD, GPIO and I2C (Second batch) Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1416315480-2053-2-git-send-email-octavian.purdila@intel.com \
--to=octavian.purdila@intel.com \
--cc=dan.carpenter@oracle.com \
--cc=johan@kernel.org \
--cc=julia.lawall@lip6.fr \
--cc=lee.jones@linaro.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).