Merge remote-tracking branches 'spi/topic/bus-num', 'spi/topic/cleanup', 'spi/topic...

[sfrench/cifs-2.6.git] / drivers / spi / spi-bcm63xx.c

diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index 77286aef2adfc9e5495704405f4c76f45855b1a0..c1cd2e0f54d1288ce155b3bc52159bf06b067c56 100644 (file)
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -35,8 +35,6 @@
 
 #include <bcm63xx_dev_spi.h>
 
-#define PFX            KBUILD_MODNAME
-
 #define BCM63XX_SPI_MAX_PREPEND                15
 
 struct bcm63xx_spi {
@@ -169,7 +167,7 @@ static int bcm63xx_txrx_bufs(struct spi_device *spi, struct spi_transfer *first,
                               transfer_list);
        }
 
-       init_completion(&bs->done);
+       reinit_completion(&bs->done);
 
        /* Fill in the Message control register */
        msg_ctl = (len << SPI_BYTE_CNT_SHIFT);
@@ -353,6 +351,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
        }
 
        bs = spi_master_get_devdata(master);
+       init_completion(&bs->done);
 
        platform_set_drvdata(pdev, master);
        bs->pdev = pdev;