ENGR00122465: Applying from 1004 release in FSL compass site.

They are not am formatted.

ENGR00122465-1-spi-polling
ENGR00122465-2-spi-poll-sync

Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index 002e7c3ffa06..cfe40a4526a7 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -780,6 +780,7 @@ static int mxc_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t
 	return 0;
 }
 
+static DECLARE_MUTEX(poll_mutex);
 /*!
  * This function is called when the data has to transfer from/to the
  * current SPI device in poll mode
@@ -798,6 +799,8 @@ int mxc_spi_poll_transfer(struct spi_device *spi, struct spi_transfer *t)
 	u32 fifo_size;
 	int chipselect_status;
 
+	down(&poll_mutex);
+
 	mxc_spi_chipselect(spi, BITBANG_CS_ACTIVE);
 
 	/* Get the master controller driver data from spi device's master */
@@ -826,7 +829,7 @@ int mxc_spi_poll_transfer(struct spi_device *spi, struct spi_transfer *t)
 
 	while ((((status = __raw_readl(master_drv_data->test_addr)) &
 		 master_drv_data->spi_ver_def->rx_cnt_mask) >> master_drv_data->
-		spi_ver_def->rx_cnt_off) != count) ;
+		spi_ver_def->rx_cnt_off) != count);
 
 	for (i = 0; i < count; i++) {
 		rx_tmp = __raw_readl(master_drv_data->base + MXC_CSPIRXDATA);
@@ -839,6 +842,7 @@ int mxc_spi_poll_transfer(struct spi_device *spi, struct spi_transfer *t)
 						     chipselect_status,
 						     (spi->chip_select &
 						      MXC_CSPICTRL_CSMASK) + 1);
+	up(&poll_mutex);
 	return 0;
 }
 
@@ -1287,6 +1291,7 @@ static struct platform_driver mxc_spi_driver = {
 static int __init mxc_spi_init(void)
 {
 	pr_debug("Registering the SPI Controller Driver\n");
+	sema_init(&poll_mutex, 1);
 	return platform_driver_register(&mxc_spi_driver);
 }