Commit 9f9e3e0d authored by Esben Haabendal's avatar Esben Haabendal Committed by Wolfram Sang

i2c: imx: Fix reinit_completion() use

Make sure to call reinit_completion() before dma is started to avoid race
condition where reinit_completion() is called after complete() and before
wait_for_completion_timeout().
Signed-off-by: default avatarEsben Haabendal <eha@deif.com>
Fixes: ce1a7884 ("i2c: imx: add DMA support for freescale i2c driver")
Reviewed-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
parent cc8de9a6
...@@ -368,6 +368,7 @@ static int i2c_imx_dma_xfer(struct imx_i2c_struct *i2c_imx, ...@@ -368,6 +368,7 @@ static int i2c_imx_dma_xfer(struct imx_i2c_struct *i2c_imx,
goto err_desc; goto err_desc;
} }
reinit_completion(&dma->cmd_complete);
txdesc->callback = i2c_imx_dma_callback; txdesc->callback = i2c_imx_dma_callback;
txdesc->callback_param = i2c_imx; txdesc->callback_param = i2c_imx;
if (dma_submit_error(dmaengine_submit(txdesc))) { if (dma_submit_error(dmaengine_submit(txdesc))) {
...@@ -622,7 +623,6 @@ static int i2c_imx_dma_write(struct imx_i2c_struct *i2c_imx, ...@@ -622,7 +623,6 @@ static int i2c_imx_dma_write(struct imx_i2c_struct *i2c_imx,
* The first byte must be transmitted by the CPU. * The first byte must be transmitted by the CPU.
*/ */
imx_i2c_write_reg(i2c_8bit_addr_from_msg(msgs), i2c_imx, IMX_I2C_I2DR); imx_i2c_write_reg(i2c_8bit_addr_from_msg(msgs), i2c_imx, IMX_I2C_I2DR);
reinit_completion(&i2c_imx->dma->cmd_complete);
time_left = wait_for_completion_timeout( time_left = wait_for_completion_timeout(
&i2c_imx->dma->cmd_complete, &i2c_imx->dma->cmd_complete,
msecs_to_jiffies(DMA_TIMEOUT)); msecs_to_jiffies(DMA_TIMEOUT));
...@@ -681,7 +681,6 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx, ...@@ -681,7 +681,6 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx,
if (result) if (result)
return result; return result;
reinit_completion(&i2c_imx->dma->cmd_complete);
time_left = wait_for_completion_timeout( time_left = wait_for_completion_timeout(
&i2c_imx->dma->cmd_complete, &i2c_imx->dma->cmd_complete,
msecs_to_jiffies(DMA_TIMEOUT)); msecs_to_jiffies(DMA_TIMEOUT));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment