projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
86ad47f
)
cassini: init before use in cas_interruptN.
author
françois romieu
<
[email protected]
>
Thu, 25 Aug 2011 05:02:49 +0000
(
05:02
+0000)
committer
David S. Miller
<
[email protected]
>
Fri, 26 Aug 2011 16:49:03 +0000
(12:49 -0400)
Signed-off-by: Francois Romieu <
[email protected]
>
Spotted-by: Thomas Jarosch <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/cassini.c
patch
|
blob
|
history
diff --git
a/drivers/net/cassini.c
b/drivers/net/cassini.c
index 646c86bcc545e08835cc07b07ca913b1ba64dbcc..fdb7a175640981186b5e891dc7f7d34fedddb223 100644
(file)
--- a/
drivers/net/cassini.c
+++ b/
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