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

+2 -8
+2 -8
drivers/scsi/ahci.c
··· 940 940 return; 941 941 942 942 /* ignore interim PIO setup fis interrupts */ 943 - if (ata_tag_valid(ap->active_tag)) { 944 - struct ata_queued_cmd *qc = 945 - ata_qc_from_tag(ap, ap->active_tag); 946 - 947 - if (qc && qc->tf.protocol == ATA_PROT_PIO && 948 - (status & PORT_IRQ_PIOS_FIS)) 949 - return; 950 - } 943 + if (ata_tag_valid(ap->active_tag) && (status & PORT_IRQ_PIOS_FIS)) 944 + return; 951 945 952 946 if (ata_ratelimit()) 953 947 ata_port_printk(ap, KERN_INFO, "spurious interrupt "