---

yaml --- r: 263549 b: refs/heads/master c: 3d01556 h: refs/heads/master i: 263547: f25b574 v: v3
git-mirror · Aug 26, 2011 · 2f794e2 · 2f794e2
1 parent 538423d
commit 2f794e2
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: 86ad47fff97a9e416aadedfe68909b2d9143dc42
+refs/heads/master: 3d015565f316584139946a1c450d44209beefeb6
diff --git a/trunk/drivers/net/cassini.c b/trunk/drivers/net/cassini.c
@@ -2452,14 +2452,13 @@ static irqreturn_t cas_interruptN(int irq, void *dev_id)
 	struct net_device *dev = dev_id;
 	struct cas *cp = netdev_priv(dev);
 	unsigned long flags;
-	int ring;
+	int ring = (irq == cp->pci_irq_INTC) ? 2 : 3;
 	u32 status = readl(cp->regs + REG_PLUS_INTRN_STATUS(ring));
 
 	/* check for shared irq */
 	if (status == 0)
 		return IRQ_NONE;
 
-	ring = (irq == cp->pci_irq_INTC) ? 2 : 3;
 	spin_lock_irqsave(&cp->lock, flags);
 	if (status & INTR_RX_DONE_ALT) { /* handle rx separately */
 #ifdef USE_NAPI