Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 187727
b: refs/heads/master
c: a089377
h: refs/heads/master
i:
  187725: 3d29b58
  187723: f5c738e
  187719: ec51d69
  187711: dab3f5e
v: v3
  • Loading branch information
Adam Buchbinder authored and Jiri Kosina committed Feb 4, 2010
1 parent 8451e59 commit 96a884a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 303863f43fa5106637325a213717b2f306e2efc3
refs/heads/master: a089377f29d3af0f62f3bdc6db0c5042513fc3f3
6 changes: 3 additions & 3 deletions trunk/drivers/net/typhoon.c
Original file line number Diff line number Diff line change
Expand Up @@ -2113,7 +2113,7 @@ typhoon_tx_timeout(struct net_device *dev)
if(typhoon_reset(tp->ioaddr, WaitNoSleep) < 0) {
printk(KERN_WARNING "%s: could not reset in tx timeout\n",
dev->name);
goto truely_dead;
goto truly_dead;
}

/* If we ever start using the Hi ring, it will need cleaning too */
Expand All @@ -2123,13 +2123,13 @@ typhoon_tx_timeout(struct net_device *dev)
if(typhoon_start_runtime(tp) < 0) {
printk(KERN_ERR "%s: could not start runtime in tx timeout\n",
dev->name);
goto truely_dead;
goto truly_dead;
}

netif_wake_queue(dev);
return;

truely_dead:
truly_dead:
/* Reset the hardware, and turn off carrier to avoid more timeouts */
typhoon_reset(tp->ioaddr, NoWait);
netif_carrier_off(dev);
Expand Down

0 comments on commit 96a884a

Please sign in to comment.