---

yaml --- r: 98671 b: refs/heads/master c: ea0c62f h: refs/heads/master i: 98669: c644f21 98667: 9190cc9 98663: db30933 98655: b81700f v: v3
git-mirror · Jul 4, 2008 · 4ef01b1 · 4ef01b1
1 parent 8028f10
commit 4ef01b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 464b3286b4aa459059c6fda85ba55185fd21d9fc
+refs/heads/master: ea0c62f7cf70f13a67830471b613337bd0c9a62e
diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c
@@ -1777,7 +1777,7 @@ static irqreturn_t ahci_interrupt(int irq, void *dev_instance)
 	struct ahci_host_priv *hpriv;
 	unsigned int i, handled = 0;
 	void __iomem *mmio;
-	u32 irq_stat, irq_ack = 0;
+	u32 irq_stat;
 
 	VPRINTK("ENTER\n");
 
@@ -1809,14 +1809,11 @@ static irqreturn_t ahci_interrupt(int irq, void *dev_instance)
 					"interrupt on disabled port %u\n", i);
 		}
 
-		irq_ack |= (1 << i);
-	}
-
-	if (irq_ack) {
-		writel(irq_ack, mmio + HOST_IRQ_STAT);
 		handled = 1;
 	}
 
+	writel(irq_stat, mmio + HOST_IRQ_STAT);
+
 	spin_unlock(&host->lock);
 
 	VPRINTK("EXIT\n");