aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorSekhar Nori <nsekhar@ti.com>2010-08-20 06:57:08 -0400
committerSekhar Nori <nsekhar@ti.com>2010-11-18 08:08:29 -0500
commit134e32b979f3f3987e84dcd5cc42040e21252e53 (patch)
treeb67396defdc2097b7f428a44d5737121aeb9bf27 /drivers/spi
parentf2bf4e849315c1573f996d082c53c6b686054da7 (diff)
spi: davinci: do not treat Tx interrupt being set as error
In davinci_spi_check_error(), Tx interrupt being set is treated as error. This function is only meant to flag bus error conditions and Tx interrupt being set at that point is not a bus error but rather a driver bug. Stop checking for Tx interrupt and flagging that as an IO error. Tested-By: Michael Williamson <michael.williamson@criticallink.com> Tested-By: Brian Niebuhr <bniebuhr@efjohnson.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/davinci_spi.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index ad814f2512f0..a60a65c690de 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -590,10 +590,6 @@ static int davinci_spi_check_error(struct davinci_spi *davinci_spi,
590 dev_dbg(sdev, "SPI Data Overrun error\n"); 590 dev_dbg(sdev, "SPI Data Overrun error\n");
591 return -EIO; 591 return -EIO;
592 } 592 }
593 if (int_status & SPIFLG_TX_INTR_MASK) {
594 dev_dbg(sdev, "SPI TX intr bit set\n");
595 return -EIO;
596 }
597 if (int_status & SPIFLG_BUF_INIT_ACTIVE_MASK) { 593 if (int_status & SPIFLG_BUF_INIT_ACTIVE_MASK) {
598 dev_dbg(sdev, "SPI Buffer Init Active\n"); 594 dev_dbg(sdev, "SPI Buffer Init Active\n");
599 return -EBUSY; 595 return -EBUSY;