a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mfd: dln2: Fix _dln2_transfer return code

Browse Source 
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>
This commit is contained in:
Octavian Purdila 2014-11-18 14:57:57 +02:00 committed by Lee Jones
parent 6732127f62
commit 7ca2b1c672
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mfd/dln2.c
View File

@ -462,6 +462,8 @@ static int _dln2_transfer(struct dln2_dev *dln2, u16 handle, u16 cmd,
if (!ret) if (!ret)
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
goto out_free_rx_slot; goto out_free_rx_slot;
} else {
ret = 0;
} }
if (dln2->disconnect) { if (dln2->disconnect) {
@ -484,10 +486,8 @@ static int _dln2_transfer(struct dln2_dev *dln2, u16 handle, u16 cmd,
goto out_free_rx_slot; goto out_free_rx_slot;
} }
if (!ibuf) { if (!ibuf)
ret = 0;
goto out_free_rx_slot; goto out_free_rx_slot;
}
if (*ibuf_len > rsp->hdr.size - sizeof(*rsp)) if (*ibuf_len > rsp->hdr.size - sizeof(*rsp))
*ibuf_len = rsp->hdr.size - sizeof(*rsp); *ibuf_len = rsp->hdr.size - sizeof(*rsp);