From 71fc42bfdb2d20d64140063660c7ba647f2df8ee Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 5 Oct 2010 21:34:11 +0200
Subject: [PATCH] --- yaml --- r: 215081 b: refs/heads/master c:
 d537f5fdfcc9c57c1e3b9fb316a4bed2bf7597e7 h: refs/heads/master i:   215079:
 1aaeb6886ccd3bb4c79d60f70d2e459b8ab9eee8 v: v3

---
 [refs]                       | 2 +-
 trunk/net/wireless/nl80211.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7838c16123cf..f87e39175bdc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e31b82136d1adc7a599b6e99d3321e5831841f5a
+refs/heads/master: d537f5fdfcc9c57c1e3b9fb316a4bed2bf7597e7
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index 8826888cc14e..9942f0b061ff 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -4418,6 +4418,8 @@ static int nl80211_pre_doit(struct genl_ops *ops, struct sk_buff *skb,
 		}
 		if (ops->internal_flags & NL80211_FLAG_CHECK_NETDEV_UP &&
 		    !netif_running(dev)) {
+			cfg80211_unlock_rdev(rdev);
+			dev_put(dev);
 			if (rtnl)
 				rtnl_unlock();
 			return -ENETDOWN;