diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-03 02:57:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-03 02:57:59 -0500 |
| commit | 950f564b707ca1b1c5bb94cd1e7d2a0702bfcadc (patch) | |
| tree | 290cc32af2f8cfd232c57d491733592aed4dbf88 /drivers/ide/pdc202xx_old.c | |
| parent | b1681c56f5b6bf551bed2617a395855055836571 (diff) | |
| parent | 8495fb1b8d016657133c01a2f258c5f192d2a1b7 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6
Diffstat (limited to 'drivers/ide/pdc202xx_old.c')
| -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 07cd37516ba6..c5f3841af360 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) | |||
| 93 | * bit 7: error, bit 6: interrupting, | 93 | * bit 7: error, bit 6: interrupting, |
| 94 | * bit 5: FIFO full, bit 4: FIFO empty | 94 | * bit 5: FIFO full, bit 4: FIFO empty |
| 95 | */ | 95 | */ |
| 96 | return ((sc1d & 0x50) == 0x40) ? 1 : 0; | 96 | return ((sc1d & 0x50) == 0x50) ? 1 : 0; |
| 97 | } else { | 97 | } else { |
| 98 | /* | 98 | /* |
| 99 | * bit 3: error, bit 2: interrupting, | 99 | * bit 3: error, bit 2: interrupting, |
| 100 | * bit 1: FIFO full, bit 0: FIFO empty | 100 | * bit 1: FIFO full, bit 0: FIFO empty |
| 101 | */ | 101 | */ |
| 102 | return ((sc1d & 0x05) == 0x04) ? 1 : 0; | 102 | return ((sc1d & 0x05) == 0x05) ? 1 : 0; |
| 103 | } | 103 | } |
| 104 | } | 104 | } |
| 105 | 105 | ||