diff options
| author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2010-04-14 05:52:59 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-22 19:11:24 -0700 |
| commit | f693be4d8a00431b53a59d74aefdb3f7ae92f662 (patch) | |
| tree | 7b4d930d91a22ac47f5ad4337174dd5ffb9aa24e /drivers/ide | |
| parent | 63e7cf910542383591318941cb62a246ac191cfe (diff) | |
| download | op-kernel-dev-f693be4d8a00431b53a59d74aefdb3f7ae92f662.zip op-kernel-dev-f693be4d8a00431b53a59d74aefdb3f7ae92f662.tar.gz | |
pdc202xx_old: ignore "FIFO empty" bit in test_irq() method
The driver takes into account not only the interrupt status bit but
also "FIFO empty" bit in its test_irq() method. This actually is a
superfluous check since for the DMA commands calling the
dma_test_irq() method further in the interrupt handler makes sure FIFO
is emptied.
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/pdc202xx_old.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c index 42ad794..3a35ec6 100644 --- a/drivers/ide/pdc202xx_old.c +++ b/drivers/ide/pdc202xx_old.c @@ -93,13 +93,13 @@ static int pdc202xx_test_irq(ide_hwif_t *hwif) * bit 7: error, bit 6: interrupting, * bit 5: FIFO full, bit 4: FIFO empty */ - return ((sc1d & 0x50) == 0x50) ? 1 : 0; + return (sc1d & 0x40) ? 1 : 0; } else { /* * bit 3: error, bit 2: interrupting, * bit 1: FIFO full, bit 0: FIFO empty */ - return ((sc1d & 0x05) == 0x05) ? 1 : 0; + return (sc1d & 0x04) ? 1 : 0; } } |
