---

yaml --- r: 9702 b: refs/heads/master c: ad6e90f h: refs/heads/master v: v3
git-mirror · Oct 6, 2005 · f16125d · f16125d
1 parent ab96e61
commit f16125d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 012e060c95e547eceea4a12c6f58592473bf4011
+refs/heads/master: ad6e90f6d0c4243cc35e07e2681a3323af533ce4
diff --git a/trunk/drivers/scsi/sata_sil24.c b/trunk/drivers/scsi/sata_sil24.c
@@ -489,12 +489,21 @@ static void sil24_error_intr(struct ata_port *ap, u32 slot_stat)
 	u32 irq_stat, cmd_err, sstatus, serror;
 
 	irq_stat = readl(port + PORT_IRQ_STAT);
+	writel(irq_stat, port + PORT_IRQ_STAT);		/* clear irq */
+
+	if (!(irq_stat & PORT_IRQ_ERROR)) {
+		/* ignore non-completion, non-error irqs for now */
+		printk(KERN_WARNING DRV_NAME
+		       "ata%u: non-error exception irq (irq_stat %x)\n",
+		       ap->id, irq_stat);
+		return;
+	}
+
 	cmd_err = readl(port + PORT_CMD_ERR);
 	sstatus = readl(port + PORT_SSTATUS);
 	serror = readl(port + PORT_SERROR);
 
 	/* Clear IRQ/errors */
-	writel(irq_stat, port + PORT_IRQ_STAT);
 	if (cmd_err)
 		writel(cmd_err, port + PORT_CMD_ERR);
 	if (serror)