diff options
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r-- | arch/arm/mach-davinci/dma.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c index 1922d461387e..d33827aadda7 100644 --- a/arch/arm/mach-davinci/dma.c +++ b/arch/arm/mach-davinci/dma.c | |||
@@ -351,8 +351,8 @@ static irqreturn_t dma_irq_handler(int irq, void *data) | |||
351 | 351 | ||
352 | dev_dbg(data, "dma_irq_handler\n"); | 352 | dev_dbg(data, "dma_irq_handler\n"); |
353 | 353 | ||
354 | if ((edma_shadow0_read_array(ctlr, SH_IPR, 0) == 0) | 354 | if ((edma_shadow0_read_array(ctlr, SH_IPR, 0) == 0) && |
355 | && (edma_shadow0_read_array(ctlr, SH_IPR, 1) == 0)) | 355 | (edma_shadow0_read_array(ctlr, SH_IPR, 1) == 0)) |
356 | return IRQ_NONE; | 356 | return IRQ_NONE; |
357 | 357 | ||
358 | while (1) { | 358 | while (1) { |
@@ -468,10 +468,10 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data) | |||
468 | } | 468 | } |
469 | } | 469 | } |
470 | } | 470 | } |
471 | if ((edma_read_array(ctlr, EDMA_EMR, 0) == 0) | 471 | if ((edma_read_array(ctlr, EDMA_EMR, 0) == 0) && |
472 | && (edma_read_array(ctlr, EDMA_EMR, 1) == 0) | 472 | (edma_read_array(ctlr, EDMA_EMR, 1) == 0) && |
473 | && (edma_read(ctlr, EDMA_QEMR) == 0) | 473 | (edma_read(ctlr, EDMA_QEMR) == 0) && |
474 | && (edma_read(ctlr, EDMA_CCERR) == 0)) | 474 | (edma_read(ctlr, EDMA_CCERR) == 0)) |
475 | break; | 475 | break; |
476 | cnt++; | 476 | cnt++; |
477 | if (cnt > 10) | 477 | if (cnt > 10) |