diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-03 17:33:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-03 17:33:59 -0700 |
| commit | efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 (patch) | |
| tree | 648069535ac84fe2d4788fd6ba601581d175f3c8 | |
| parent | 8861e98115f185d9946d92deaee6c3639ef8d414 (diff) | |
| parent | f1d39b291e2263f5e2f2ec5d4061802f76d8ae67 (diff) | |
| download | linux-3.10-efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48.tar.gz linux-3.10-efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48.tar.bz2 linux-3.10-efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[PATCH] ahci: skip protocol test altogether in spurious interrupt code
| -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 77e7202a0eb..904c25fb4ba 100644 --- a/drivers/scsi/ahci.c +++ b/drivers/scsi/ahci.c @@ -940,14 +940,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 " |