| Message ID | 1419687233-10498-1-git-send-email-der.herr@hofr.at |
|---|---|
| State | Accepted |
| Headers | show |
On Sat, Dec 27, 2014 at 08:33:53AM -0500, Nicholas Mc Guire wrote: > wait_for_completion_timeout does not return negative values so > "result" handling here should be simplified to cover the actually > possible cases only. > > patch was only compile tested for imx_v6_v7_defconfig > > V2 spellchecked this time and proper labeling as > suggested by Sedat Dilek <sedat.dilek@gmail.com> > > patch is against linux-next 3.19.0-rc1 -next-20141226 The last two paragraphs should have been below "---" but other than that, all is OK. > > Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at> Applied to for-next, thanks!
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 7f3a9fe..2be7d9d 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -628,9 +628,9 @@ static int i2c_imx_dma_write(struct imx_i2c_struct *i2c_imx, result = wait_for_completion_timeout( &i2c_imx->dma->cmd_complete, msecs_to_jiffies(DMA_TIMEOUT)); - if (result <= 0) { + if (result == 0) { dmaengine_terminate_all(dma->chan_using); - return result ?: -ETIMEDOUT; + return -ETIMEDOUT; } /* Waiting for transfer complete. */ @@ -686,9 +686,9 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx, result = wait_for_completion_timeout( &i2c_imx->dma->cmd_complete, msecs_to_jiffies(DMA_TIMEOUT)); - if (result <= 0) { + if (result == 0) { dmaengine_terminate_all(dma->chan_using); - return result ?: -ETIMEDOUT; + return -ETIMEDOUT; } /* waiting for transfer complete. */
wait_for_completion_timeout does not return negative values so "result" handling here should be simplified to cover the actually possible cases only. patch was only compile tested for imx_v6_v7_defconfig V2 spellchecked this time and proper labeling as suggested by Sedat Dilek <sedat.dilek@gmail.com> patch is against linux-next 3.19.0-rc1 -next-20141226 Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at> --- drivers/i2c/busses/i2c-imx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)