From 9b73f218fa0521c77b70fe397f2d5ba5be184c85 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 3 Jul 2006 00:25:23 -0700 Subject: [PATCH] --- yaml --- r: 31835 b: refs/heads/master c: e745165c6d235c03e9fa0e57984ca6fd3d3b2c50 h: refs/heads/master i: 31833: 95398891ea2420244e2b77ab841691cc09ad01be 31831: 1d0c2dde8ef659e18c50967821f5d630420564be v: v3 --- [refs] | 2 +- trunk/drivers/net/8390.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eb1b8030c77d..48b4312b8c6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 933a2efc59513551dcfa7b814752dc581bd3c60b +refs/heads/master: e745165c6d235c03e9fa0e57984ca6fd3d3b2c50 diff --git a/trunk/drivers/net/8390.c b/trunk/drivers/net/8390.c index 86be96af9c8f..d2935ae39814 100644 --- a/trunk/drivers/net/8390.c +++ b/trunk/drivers/net/8390.c @@ -249,7 +249,7 @@ 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. */ @@ -257,7 +257,7 @@ void ei_tx_timeout(struct net_device *dev) NS8390_init(dev, 1); spin_unlock(&ei_local->page_lock); - enable_irq(dev->irq); + enable_irq_lockdep(dev->irq); netif_wake_queue(dev); }