---

yaml --- r: 130500 b: refs/heads/master c: 1609559 h: refs/heads/master v: v3
git-mirror · Jan 30, 2009 · 15162bb · 15162bb
1 parent 15457e1
commit 15162bb
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: b1c4a9dddf09fe99b8f88252718ac5b357363dc4
+refs/heads/master: 1609559547ae0ddc2e4829c7f78ac2c4869875b9
diff --git a/trunk/drivers/net/smsc9420.c b/trunk/drivers/net/smsc9420.c
@@ -1378,6 +1378,7 @@ static int smsc9420_open(struct net_device *dev)
 
 	/* test the IRQ connection to the ISR */
 	smsc_dbg(IFUP, "Testing ISR using IRQ %d", dev->irq);
+	pd->software_irq_signal = false;
 
 	spin_lock_irqsave(&pd->int_lock, flags);
 	/* configure interrupt deassertion timer and enable interrupts */
@@ -1393,8 +1394,6 @@ static int smsc9420_open(struct net_device *dev)
 	smsc9420_pci_flush_write(pd);
 
 	timeout = 1000;
-	pd->software_irq_signal = false;
-	smp_wmb();
 	while (timeout--) {
 		if (pd->software_irq_signal)
 			break;