Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efe78cda authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8861e981 f1d39b29

drivers/scsi/ahci.c

+2 −8
Original line number Diff line number Diff line
@@ -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))

	if (ata_tag_valid(ap->active_tag) && (status & PORT_IRQ_PIOS_FIS)) 

		return;

	}



	if (ata_ratelimit())

		ata_port_printk(ap, KERN_INFO, "spurious interrupt "