Merge remote-tracking branches 'spi/topic/drivers', 'spi/topic/dw', 'spi/topic/efm32...

[linux-2.6-block.git] / drivers / spi / spi-efm32.c

diff --git a/drivers/spi/spi-efm32.c b/drivers/spi/spi-efm32.c
index 4a5a359dafcaf99069ccbe5145cf5e2093401926..be44a3eeb5e8b2b244704a48a4c2fc4184b45aa0 100644 (file)
--- a/drivers/spi/spi-efm32.c
+++ b/drivers/spi/spi-efm32.c
@@ -198,7 +198,7 @@ static int efm32_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
 
        efm32_spi_filltx(ddata);
 
-       init_completion(&ddata->done);
+       reinit_completion(&ddata->done);
 
        efm32_spi_write32(ddata, REG_IF_TXBL | REG_IF_RXDATAV, REG_IEN);
 
@@ -349,6 +349,7 @@ static int efm32_spi_probe(struct platform_device *pdev)
        ddata->bitbang.txrx_bufs = efm32_spi_txrx_bufs;
 
        spin_lock_init(&ddata->lock);
+       init_completion(&ddata->done);
 
        ddata->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(ddata->clk)) {