---

yaml --- r: 35375 b: refs/heads/master c: f4b5cc8 h: refs/heads/master i: 35373: 37b3c2e 35371: c31ae06 35367: 02de5ec 35359: d99fab1 v: v3
git-mirror · Aug 9, 2006 · 48ab154 · 48ab154
1 parent 4954b24
commit 48ab154
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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);