Merge remote-tracking branch 'spi/fix/core' into spi-linus

[firefly-linux-kernel-4.4.55.git] / drivers / spi / spi-sirf.c

diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index 592b4aff651f674c39f5c136a7bab01f9b178898..ed5e501c465276b6d39318818fa5d668d2685668 100644 (file)
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -305,8 +305,8 @@ static int spi_sirfsoc_transfer(struct spi_device *spi, struct spi_transfer *t)
        sspi->tx = t->tx_buf ? t->tx_buf : sspi->dummypage;
        sspi->rx = t->rx_buf ? t->rx_buf : sspi->dummypage;
        sspi->left_tx_word = sspi->left_rx_word = t->len / sspi->word_width;
-       INIT_COMPLETION(sspi->rx_done);
-       INIT_COMPLETION(sspi->tx_done);
+       reinit_completion(&sspi->rx_done);
+       reinit_completion(&sspi->tx_done);
 
        writel(SIRFSOC_SPI_INT_MASK_ALL, sspi->base + SIRFSOC_SPI_INT_STATUS);