lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6

Browse Source
This commit is contained in:
David S. Miller
2010-03-02 23:57:59 -08:00
parent b1681c56f5 8495fb1b8d
commit 950f564b70
6 changed files with 82 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ide/pdc202xx_old.c
View File

@ -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;
}
}