---

yaml --- r: 175222 b: refs/heads/master c: a4b0295 h: refs/heads/master v: v3
git-mirror · Dec 11, 2009 · 132b4b4 · 132b4b4
1 parent c275f0e
commit 132b4b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8be9226c8f686c6dd2bae0a7ed4f5795e89d32d8
+refs/heads/master: a4b02959d5bec1b3e3a3e266b196673a89e62c29
diff --git a/trunk/drivers/staging/vme/bridges/vme_tsi148.c b/trunk/drivers/staging/vme/bridges/vme_tsi148.c
@@ -237,7 +237,6 @@ static u32 tsi148_VERR_irqhandler(void)
  */
 static u32 tsi148_IACK_irqhandler(void)
 {
-	printk("tsi148_IACK_irqhandler\n");
 	wake_up(&iack_queue);
 
 	return TSI148_LCSR_INTC_IACKC;
@@ -2121,7 +2120,7 @@ int tsi148_lm_detach(struct vme_lm_resource *lm, int monitor)
 	iowrite32be(tmp, tsi148_bridge->base + TSI148_LCSR_INTEO);
 
 	iowrite32be(TSI148_LCSR_INTC_LMC[monitor],
-		 tsi148_bridge->base + TSI148_LCSR_INTEO);
+		 tsi148_bridge->base + TSI148_LCSR_INTC);
 
 	/* Detach callback */
 	lm_callback[monitor] = NULL;
@@ -2581,13 +2580,6 @@ static void tsi148_remove(struct pci_dev *pdev)
 		iowrite32be(0x8000, tsi148_bridge->base + TSI148_LCSR_VICR);
 	}
 
-	/*
-	 *  Disable and clear all interrupts.
-	 */
-	iowrite32be(0x0, tsi148_bridge->base + TSI148_LCSR_INTEO);
-	iowrite32be(0xFFFFFFFF, tsi148_bridge->base + TSI148_LCSR_INTC);
-	iowrite32be(0xFFFFFFFF, tsi148_bridge->base + TSI148_LCSR_INTEN);
-
 	/*
 	 *  Map all Interrupts to PCI INTA
 	 */