Commit a718728f authored Jan 27, 2007 by Tejun Heo Committed by Jeff Garzik Jan 27, 2007

ahci: port_no should be used when clearing IRQ in ahci_thaw()



ap->id is logcial port ID which is unique among all ATA ports and
doesn't have anything to do with hardware port index.  ap->port_no is
the hardware port index and thus should be used when clearing IRQ mask
in ahci_thaw().

This problem has been spotted by Jeff Garzik <jgarzik@pobox.com>.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

parent 7d620a4e

drivers/ata/ahci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1282,7 +1282,7 @@ static void ahci_thaw(struct ata_port *ap)
		/* clear IRQ */
		tmp = readl(port_mmio + PORT_IRQ_STAT);
		writel(tmp, port_mmio + PORT_IRQ_STAT);
		writel(1 << ap->id, mmio + HOST_IRQ_STAT);
		writel(1 << ap->port_no, mmio + HOST_IRQ_STAT);

		/* turn IRQ back on */
		writel(DEF_PORT_IRQ, port_mmio + PORT_IRQ_MASK);