提交 41682e03 编写于 作者: M Marek Vasut 提交者: Mark Brown

mxs/spi: Fix misuse of init_completion

The init_completion() call does reinit not only the variable carrying
the flag that the completion finished, but also initialized the
waitqueue associated with the completion. On the contrary, the
INIT_COMPLETION() call only reinits the flag.

In case there was anything still stuck in the waitqueue, subsequent call
to init_completion() would be able to create possible race condition. This
patch uses the proper function and moves init_completion() into .probe() call
of the driver, to be issued only once.

Note that such scenario is impossible, since two threads can never enter the
mxs_spi_txrx_dma(), since whole this section is protected by mutex in SPI core.
This by no means allows this issue to exit though.
Signed-off-by: NMarek Vasut <marex@denx.de>
Cc: Chris Ball <cjb@laptop.org>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
上级 c895db0f
...@@ -230,7 +230,7 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, int cs, ...@@ -230,7 +230,7 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, int cs,
return -EINVAL; return -EINVAL;
} }
init_completion(&spi->c); INIT_COMPLETION(spi->c);
if (*first) if (*first)
pio |= BM_SSP_CTRL0_LOCK_CS; pio |= BM_SSP_CTRL0_LOCK_CS;
...@@ -549,6 +549,8 @@ static int __devinit mxs_spi_probe(struct platform_device *pdev) ...@@ -549,6 +549,8 @@ static int __devinit mxs_spi_probe(struct platform_device *pdev)
ssp->devid = devid; ssp->devid = devid;
ssp->dma_channel = dma_channel; ssp->dma_channel = dma_channel;
init_completion(&spi->c);
ret = devm_request_irq(&pdev->dev, irq_err, mxs_ssp_irq_handler, 0, ret = devm_request_irq(&pdev->dev, irq_err, mxs_ssp_irq_handler, 0,
DRIVER_NAME, ssp); DRIVER_NAME, ssp);
if (ret) if (ret)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册