From 2f794e27675c0133e28d12c6d3f860f0f91e517d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?fran=C3=A7ois=20romieu?= Date: Thu, 25 Aug 2011 05:02:49 +0000 Subject: [PATCH] --- yaml --- r: 263549 b: refs/heads/master c: 3d015565f316584139946a1c450d44209beefeb6 h: refs/heads/master i: 263547: f25b5740ea5809fe8061eb4165f57792ea4ecc6a v: v3 --- [refs] | 2 +- trunk/drivers/net/cassini.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e6f3145c7011..b9120cafd5a5 100644 --- 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 index 646c86bcc545..fdb7a1756409 100644 --- 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