diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
| commit | 5e66dd6d66ffe758b39b6dcadf2330753ee1159b (patch) | |
| tree | a72cdcff4448e4af9425cc213ddf56ab23e697fe /drivers/net/8390.c | |
| parent | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/net/8390.c')
| -rw-r--r-- | drivers/net/8390.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/8390.c b/drivers/net/8390.c index 86be96af9c8f..d2935ae39814 100644 --- a/drivers/net/8390.c +++ b/drivers/net/8390.c | |||
| @@ -249,7 +249,7 @@ void ei_tx_timeout(struct net_device *dev) | |||
| 249 | 249 | ||
| 250 | /* Ugly but a reset can be slow, yet must be protected */ | 250 | /* Ugly but a reset can be slow, yet must be protected */ |
| 251 | 251 | ||
| 252 | disable_irq_nosync(dev->irq); | 252 | disable_irq_nosync_lockdep(dev->irq); |
| 253 | spin_lock(&ei_local->page_lock); | 253 | spin_lock(&ei_local->page_lock); |
| 254 | 254 | ||
| 255 | /* Try to restart the card. Perhaps the user has fixed something. */ | 255 | /* Try to restart the card. Perhaps the user has fixed something. */ |
| @@ -257,7 +257,7 @@ void ei_tx_timeout(struct net_device *dev) | |||
| 257 | NS8390_init(dev, 1); | 257 | NS8390_init(dev, 1); |
| 258 | 258 | ||
| 259 | spin_unlock(&ei_local->page_lock); | 259 | spin_unlock(&ei_local->page_lock); |
| 260 | enable_irq(dev->irq); | 260 | enable_irq_lockdep(dev->irq); |
| 261 | netif_wake_queue(dev); | 261 | netif_wake_queue(dev); |
| 262 | } | 262 | } |
| 263 | 263 | ||