Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code »

Commit 3d015565f316584139946a1c450d44209beefeb6

Authored by françois romieu
Committed by David S. Miller
1 parent 86ad47fff9
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

cassini: init before use in cas_interruptN. 

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Spotted-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 1 additions and 2 deletions Side-by-side Diff

drivers/net/cassini.c
Diff comments   View file @ 3d01556
... ... @@ -2452,14 +2452,13 @@
2452 2452 struct net_device *dev = dev_id;
2453 2453 struct cas *cp = netdev_priv(dev);
2454 2454 unsigned long flags;
2455   - int ring;
  2455 + int ring = (irq == cp->pci_irq_INTC) ? 2 : 3;
2456 2456 u32 status = readl(cp->regs + REG_PLUS_INTRN_STATUS(ring));
2457 2457  
2458 2458 /* check for shared irq */
2459 2459 if (status == 0)
2460 2460 return IRQ_NONE;
2461 2461  
2462   - ring = (irq == cp->pci_irq_INTC) ? 2 : 3;
2463 2462 spin_lock_irqsave(&cp->lock, flags);
2464 2463 if (status & INTR_RX_DONE_ALT) { /* handle rx separately */
2465 2464 #ifdef USE_NAPI