aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-davinci/include/mach/spi.h1
-rw-r--r--drivers/spi/davinci_spi.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/include/mach/spi.h b/arch/arm/mach-davinci/include/mach/spi.h
index 734d1fb99614..fe699140269c 100644
--- a/arch/arm/mach-davinci/include/mach/spi.h
+++ b/arch/arm/mach-davinci/include/mach/spi.h
@@ -32,7 +32,6 @@ struct davinci_spi_platform_data {
32 u8 wdelay; 32 u8 wdelay;
33 u8 odd_parity; 33 u8 odd_parity;
34 u8 parity_enable; 34 u8 parity_enable;
35 u8 wait_enable;
36 u8 timer_disable; 35 u8 timer_disable;
37 u8 clk_internal; 36 u8 clk_internal;
38 u8 intr_level; 37 u8 intr_level;
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 17269ad54a99..54808577c121 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -522,7 +522,7 @@ static int davinci_spi_setup(struct spi_device *spi)
522 SPIFMT_PARITYENA_MASK, 522 SPIFMT_PARITYENA_MASK,
523 spi->chip_select); 523 spi->chip_select);
524 524
525 if (davinci_spi->pdata->wait_enable) 525 if (spi->mode & SPI_READY)
526 set_fmt_bits(davinci_spi->base, 526 set_fmt_bits(davinci_spi->base,
527 SPIFMT_WAITENA_MASK, 527 SPIFMT_WAITENA_MASK,
528 spi->chip_select); 528 spi->chip_select);