Skip to contentSkip to conversation

misc 3c505 bits

PATCH In review [email protected] 2 participants 3 messages Aug 11, 2003 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 misc 3c505 bits

- Remove unneeded breaks
- Fix double spin_unlock_irqrestore problem

drivers/net/3c505.c +2 -2
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/net/3c505.c linux-2.5/drivers/net/3c505.c
@@ -449,18 +449,18 @@ static int send_pcb(struct net_device *d
 		case ASF_PCB_ACK:
 			adapter->send_pcb_semaphore = 0;
 			return TRUE;
-			break;
+
 		case ASF_PCB_NAK:
 #ifdef ELP_DEBUG
 			printk(KERN_DEBUG "%s: send_pcb got NAK\n", dev->name);
 #endif
 			goto abort;
-			break;
 		}
 	}
 
 	if (elp_debug >= 1)
 		printk(KERN_DEBUG "%s: timeout waiting for PCB acknowledge (status %02x)\n", dev->name, inb_status(dev->base_addr));
+	goto abort;
 
       sti_abort:
 	spin_unlock_irqrestore(&adapter->lock, flags);
#1 lore raw
Quoted 8 lines · On Mon, Aug 11, 2003 at 02:40:25PM +0100, [email protected] wrote:

- Remove unneeded breaks
- Fix double spin_unlock_irqrestore problem

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/net/3c505.c linux-2.5/drivers/net/3c505.c

drivers/net/3c505.c +0 -0
@@ -449,18 +449,18 @@ static int send_pcb(struct net_device *d
 		case ASF_PCB_ACK:

drivers/net/3c505.c static int send_pcb(struct net_device *d · line 458

Quoted 10 lines
drivers/net/3c505.c +1 -2
 			adapter->send_pcb_semaphore = 0;
 			return TRUE;
-			break;
+
 		case ASF_PCB_NAK:
 #ifdef ELP_DEBUG
 			printk(KERN_DEBUG "%s: send_pcb got NAK\n", dev->name);
 #endif
 			goto abort;
-			break;

Disagree: borks message. You receive an ACK, and print "got NAK".

Jeff

#2 lore raw
Quoted 1 line · Jeff Garzik

Disagree: borks message. You receive an ACK, and print "got NAK".

ENOCAFFEINE. Nevermind. I am wrong.

Jeff