[PATCH v2 -next] i2c: imx: fix handling of wait_for_completion_timeout result
From: Nicholas Mc Guire <hidden>
Date: 2014-12-27 13:37:56
Also in:
linux-i2c, lkml
Subsystem:
freescale imx i2c driver, i2c subsystem, i2c subsystem host drivers, the rest · Maintainers:
Oleksij Rempel, Andi Shyti, Linus Torvalds
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 [off-list ref] patch is against linux-next 3.19.0-rc1 -next-20141226 Signed-off-by: Nicholas Mc Guire <redacted> --- drivers/i2c/busses/i2c-imx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
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. */
--
1.7.10.4