---

yaml --- r: 342107 b: refs/heads/master c: cbbc013 h: refs/heads/master i: 342105: 488496f 342103: dc102af v: v3
git-mirror · Dec 10, 2012 · 4220f7c · 4220f7c
1 parent e7f8660
commit 4220f7c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3edfd10b45ae4ebe8ff905f626708c49e4fdc167
+refs/heads/master: cbbc0138efe1dcd5426b8fc5d87741f5057aee72
diff --git a/trunk/drivers/bcma/driver_mips.c b/trunk/drivers/bcma/driver_mips.c
@@ -115,7 +115,7 @@ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq)
 			    bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) &
 			    ~(1 << irqflag));
 	else
-		bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(irq), 0);
+		bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(oldirq), 0);
 
 	/* assign the new one */
 	if (irq == 0) {