From 48ab15403612b81c46117054927938c91c4eb823 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 7 Aug 2006 11:39:04 +0900 Subject: [PATCH] --- yaml --- r: 35375 b: refs/heads/master c: f4b5cc874158a139c091b3decd468929e10645e6 h: refs/heads/master i: 35373: 37b3c2ec1b5b4d15de4c77484283ec52745f0bd5 35371: c31ae065647e0d8dacb32e050c3bbbdd3a7b4987 35367: 02de5ec46918423c6f9649a80605fcbd149218a0 35359: d99fab1661fe38d339a3d9dd6b5b33d8af9acba1 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ahci.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f8fc760d06ec..fae8aca5891b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80289167fd3ebaeb7b2641e69cbec44b61165fe7 +refs/heads/master: f4b5cc874158a139c091b3decd468929e10645e6 diff --git a/trunk/drivers/scsi/ahci.c b/trunk/drivers/scsi/ahci.c index f5734a97580a..68fd7667a082 100644 --- a/trunk/drivers/scsi/ahci.c +++ b/trunk/drivers/scsi/ahci.c @@ -662,14 +662,13 @@ static void ahci_init_controller(void __iomem *mmio, struct pci_dev *pdev, VPRINTK("PORT_SCR_ERR 0x%x\n", tmp); writel(tmp, port_mmio + PORT_SCR_ERR); - /* clear & turn off port IRQ */ + /* clear port IRQ */ tmp = readl(port_mmio + PORT_IRQ_STAT); VPRINTK("PORT_IRQ_STAT 0x%x\n", tmp); if (tmp) writel(tmp, port_mmio + PORT_IRQ_STAT); writel(1 << i, mmio + HOST_IRQ_STAT); - writel(0, port_mmio + PORT_IRQ_MASK); } tmp = readl(mmio + HOST_CTL);