Commit 7ca2b1c6 authored Nov 18, 2014 by Octavian Purdila Committed by Lee Jones Nov 19, 2014

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@lip6.fr>
Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

parent 6732127f

drivers/mfd/dln2.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);