diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:35:48 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:35:48 -0400 |
| commit | 36a2c6b28003dd0592b8ece5e9409991e0820f50 (patch) | |
| tree | c5b52547b2658a8a3b898b8224b835a7e8396017 /drivers/scsi/ahci.c | |
| parent | [libata] ahci: add SiS PCI IDs (diff) | |
| parent | [PATCH] ahci: skip protocol test altogether in spurious interrupt code (diff) | |
| download | linux-dev-36a2c6b28003dd0592b8ece5e9409991e0820f50.tar.xz linux-dev-36a2c6b28003dd0592b8ece5e9409991e0820f50.zip | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/scsi/ahci.c')
| -rw-r--r-- | drivers/scsi/ahci.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c index 35058f9296d8..f5734a97580a 100644 --- a/drivers/scsi/ahci.c +++ b/drivers/scsi/ahci.c @@ -1076,14 +1076,8 @@ static void ahci_host_intr(struct ata_port *ap) return; /* ignore interim PIO setup fis interrupts */ - if (ata_tag_valid(ap->active_tag)) { - struct ata_queued_cmd *qc = - ata_qc_from_tag(ap, ap->active_tag); - - if (qc && qc->tf.protocol == ATA_PROT_PIO && - (status & PORT_IRQ_PIOS_FIS)) - return; - } + if (ata_tag_valid(ap->active_tag) && (status & PORT_IRQ_PIOS_FIS)) + return; if (ata_ratelimit()) ata_port_printk(ap, KERN_INFO, "spurious interrupt " |