From d21179a686205c683e2bf6ac7eaaeac67807eb93 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marex@denx.de>
Date: Fri, 24 Aug 2012 04:56:27 +0200
Subject: [PATCH] --- yaml --- r: 328625 b: refs/heads/master c:
 41682e03d4fdc947dbd22725d70f222cc7746852 h: refs/heads/master i:   328623:
 c9342851d72c857595de3898665b414023e9a838 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/spi/spi-mxs.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bd81fa76700b..bace485d702a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c895db0fb2c9e77fd94ba7995e2a01652a91910c
+refs/heads/master: 41682e03d4fdc947dbd22725d70f222cc7746852
diff --git a/trunk/drivers/spi/spi-mxs.c b/trunk/drivers/spi/spi-mxs.c
index 447f917fe66f..4e7801dd571a 100644
--- a/trunk/drivers/spi/spi-mxs.c
+++ b/trunk/drivers/spi/spi-mxs.c
@@ -230,7 +230,7 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, int cs,
 		return -EINVAL;
 	}
 
-	init_completion(&spi->c);
+	INIT_COMPLETION(spi->c);
 
 	if (*first)
 		pio |= BM_SSP_CTRL0_LOCK_CS;
@@ -549,6 +549,8 @@ static int __devinit mxs_spi_probe(struct platform_device *pdev)
 	ssp->devid = devid;
 	ssp->dma_channel = dma_channel;
 
+	init_completion(&spi->c);
+
 	ret = devm_request_irq(&pdev->dev, irq_err, mxs_ssp_irq_handler, 0,
 			       DRIVER_NAME, ssp);
 	if (ret)