From cf951bb35d48a001176210b05b482b71915decba Mon Sep 17 00:00:00 2001 From: Amerigo Wang Date: Fri, 10 Aug 2012 01:24:39 +0000 Subject: [PATCH] --- yaml --- r: 321964 b: refs/heads/master c: 3335f0ca130c201f8680e97f63612053fbc16e22 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/netconsole.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index cdb24b2680fa..ce67701cf85d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38e6bc185d9544dfad1774b3f8902a0b061aea25 +refs/heads/master: 3335f0ca130c201f8680e97f63612053fbc16e22 diff --git a/trunk/drivers/net/netconsole.c b/trunk/drivers/net/netconsole.c index f9347ea3d381..f0ad56c13933 100644 --- a/trunk/drivers/net/netconsole.c +++ b/trunk/drivers/net/netconsole.c @@ -640,12 +640,7 @@ static int netconsole_netdev_event(struct notifier_block *this, * rtnl_lock already held */ if (nt->np.dev) { - spin_unlock_irqrestore( - &target_list_lock, - flags); __netpoll_cleanup(&nt->np); - spin_lock_irqsave(&target_list_lock, - flags); dev_put(nt->np.dev); nt->np.dev = NULL; netconsole_target_put(nt);