aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMike Frysinger <vapier.adi@gmail.com>2009-04-06 22:00:38 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 11:31:05 -0400
commit40a2945b97b4da9120653d84f1c3a58fe58be64c (patch)
tree7c051cfc046035f9489df4bbccfa15c2de459b9b /drivers
parentd24bd1d0dc850e7aa68c27ec288eb699d41a5916 (diff)
Blackfin SPI Driver: do not check for SPI errors if DMA itself did not flag any
We only need to check SPI error when DMA failes, cause that is the DMA IRQ handling routine. Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org> Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/spi_bfin5xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c
index 5acec9ff0175..5ebb67b011d0 100644
--- a/drivers/spi/spi_bfin5xx.c
+++ b/drivers/spi/spi_bfin5xx.c
@@ -587,7 +587,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
587 while (!(read_STAT(drv_data) & SPIF)) 587 while (!(read_STAT(drv_data) & SPIF))
588 cpu_relax(); 588 cpu_relax();
589 589
590 if (spistat & RBSY) { 590 if ((dmastat & DMA_ERR) && (spistat & RBSY)) {
591 msg->state = ERROR_STATE; 591 msg->state = ERROR_STATE;
592 dev_err(&drv_data->pdev->dev, "dma receive: fifo/buffer overflow\n"); 592 dev_err(&drv_data->pdev->dev, "dma receive: fifo/buffer overflow\n");
593 } else { 593 } else {