diff --git a/[refs] b/[refs] index 0d60e0f8ef36..c09a8f151e3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56af326830757f3e8a1742770d15dfd6e3c40e85 +refs/heads/master: 92e44948b2b3b2db8f39f17033f98ae2356156a5 diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c index f15b1af2c768..4ff827e8c362 100644 --- a/trunk/net/wireless/nl80211.c +++ b/trunk/net/wireless/nl80211.c @@ -4990,7 +4990,7 @@ static int nl80211_set_power_save(struct sk_buff *skb, struct genl_info *info) err = get_rdev_dev_by_info_ifindex(info, &rdev, &dev); if (err) - goto unlock_rdev; + goto unlock_rtnl; wdev = dev->ieee80211_ptr; @@ -5014,6 +5014,7 @@ static int nl80211_set_power_save(struct sk_buff *skb, struct genl_info *info) unlock_rdev: cfg80211_unlock_rdev(rdev); dev_put(dev); +unlock_rtnl: rtnl_unlock(); out: