diff options
| author | Mike Frysinger <vapier.adi@gmail.com> | 2009-04-06 19:00:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 08:31:05 -0700 |
| commit | 40a2945b97b4da9120653d84f1c3a58fe58be64c (patch) | |
| tree | 7c051cfc046035f9489df4bbccfa15c2de459b9b /drivers/spi/spi_bfin5xx.c | |
| parent | d24bd1d0dc850e7aa68c27ec288eb699d41a5916 (diff) | |
| download | op-kernel-dev-40a2945b97b4da9120653d84f1c3a58fe58be64c.zip op-kernel-dev-40a2945b97b4da9120653d84f1c3a58fe58be64c.tar.gz | |
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/spi/spi_bfin5xx.c')
| -rw-r--r-- | drivers/spi/spi_bfin5xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c index 5acec9f..5ebb67b 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) while (!(read_STAT(drv_data) & SPIF)) cpu_relax(); - if (spistat & RBSY) { + if ((dmastat & DMA_ERR) && (spistat & RBSY)) { msg->state = ERROR_STATE; dev_err(&drv_data->pdev->dev, "dma receive: fifo/buffer overflow\n"); } else { |
