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

Merge branch 'master'

Browse Source
This commit is contained in:
Jeff Garzik
2005-10-29 17:49:12 -04:00
parent 5615ca7906 be15cd72d2
commit b0c4e148bd
946 changed files with 71712 additions and 32515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/pdc_adma.c
View File

@ -490,7 +490,7 @@ static inline unsigned int adma_intr_mmio(struct ata_host_set *host_set)
if (qc && (!(qc->tf.ctl & ATA_NIEN))) {
/* check main status, clearing INTRQ */
u8 status = ata_chk_status(ap);
u8 status = ata_check_status(ap);
if ((status & ATA_BUSY))
continue;
DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",