From a22ab0f7f4b97cfc4f09d0263c80168d6777598b Mon Sep 17 00:00:00 2001
From: Veaceslav Falico <vfalico@redhat.com>
Date: Mon, 11 Mar 2013 00:21:48 +0000
Subject: [PATCH] --- yaml --- r: 361431 b: refs/heads/master c:
 3f315bef23075ea8a98a6fe4221a83b83456d970 h: refs/heads/master i:   361429:
 5a7689125eabef23a98f1866219c3d9c22e31a5c   361427:
 3b1e0ebd7c4255b67703b50384d0f6931825a900   361423:
 74af0cf3ddfa33ea180fbc96eac196466bb3fd2a v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/net/netconsole.c | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 66d701d227a5..579978b9801c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3da889b616164bde76a37350cf28e0d17a94e979
+refs/heads/master: 3f315bef23075ea8a98a6fe4221a83b83456d970
diff --git a/trunk/drivers/net/netconsole.c b/trunk/drivers/net/netconsole.c
index 37add21a3d7d..59ac143dec25 100644
--- a/trunk/drivers/net/netconsole.c
+++ b/trunk/drivers/net/netconsole.c
@@ -666,6 +666,7 @@ static int netconsole_netdev_event(struct notifier_block *this,
 		goto done;
 
 	spin_lock_irqsave(&target_list_lock, flags);
+restart:
 	list_for_each_entry(nt, &target_list, list) {
 		netconsole_target_get(nt);
 		if (nt->np.dev == dev) {
@@ -678,15 +679,17 @@ static int netconsole_netdev_event(struct notifier_block *this,
 			case NETDEV_UNREGISTER:
 				/*
 				 * rtnl_lock already held
+				 * we might sleep in __netpoll_cleanup()
 				 */
-				if (nt->np.dev) {
-					__netpoll_cleanup(&nt->np);
-					dev_put(nt->np.dev);
-					nt->np.dev = NULL;
-				}
+				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;
 				nt->enabled = 0;
 				stopped = true;
-				break;
+				netconsole_target_put(nt);
+				goto restart;
 			}
 		}
 		netconsole_target_put(nt);