Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 31835
b: refs/heads/master
c: e745165
h: refs/heads/master
i:
  31833: 9539889
  31831: 1d0c2dd
v: v3
  • Loading branch information
Ingo Molnar authored and Linus Torvalds committed Jul 3, 2006
1 parent 473129a commit 9b73f21
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 933a2efc59513551dcfa7b814752dc581bd3c60b
refs/heads/master: e745165c6d235c03e9fa0e57984ca6fd3d3b2c50
4 changes: 2 additions & 2 deletions trunk/drivers/net/8390.c
Original file line number Diff line number Diff line change
Expand Up @@ -249,15 +249,15 @@ void ei_tx_timeout(struct net_device *dev)

/* Ugly but a reset can be slow, yet must be protected */

disable_irq_nosync(dev->irq);
disable_irq_nosync_lockdep(dev->irq);
spin_lock(&ei_local->page_lock);

/* Try to restart the card. Perhaps the user has fixed something. */
ei_reset_8390(dev);
NS8390_init(dev, 1);

spin_unlock(&ei_local->page_lock);
enable_irq(dev->irq);
enable_irq_lockdep(dev->irq);
netif_wake_queue(dev);
}

Expand Down

0 comments on commit 9b73f21

Please sign in to comment.