aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pdc202xx_old.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-03-02 23:57:59 -0800
committerDavid S. Miller <davem@davemloft.net>2010-03-02 23:57:59 -0800
commit950f564b707ca1b1c5bb94cd1e7d2a0702bfcadc (patch)
tree290cc32af2f8cfd232c57d491733592aed4dbf88 /drivers/ide/pdc202xx_old.c
parentdrivers/ide: Fix continuation line formats (diff)
parentide: fixed section mismatch warning in cmd640.c (diff)
downloadlinux-dev-950f564b707ca1b1c5bb94cd1e7d2a0702bfcadc.tar.xz
linux-dev-950f564b707ca1b1c5bb94cd1e7d2a0702bfcadc.zip
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.c4
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)
* bit 7: error, bit 6: interrupting,
* bit 5: FIFO full, bit 4: FIFO empty
*/
- return ((sc1d & 0x50) == 0x40) ? 1 : 0;
+ return ((sc1d & 0x50) == 0x50) ? 1 : 0;
} else {
/*
* bit 3: error, bit 2: interrupting,
* bit 1: FIFO full, bit 0: FIFO empty
*/
- return ((sc1d & 0x05) == 0x04) ? 1 : 0;
+ return ((sc1d & 0x05) == 0x05) ? 1 : 0;
}
}