revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / net / wireless / nl80211.c

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 9a8cde999955ec6ee1a149925cf1903e92a060be..37902a54e9c154fb8dbed3e1d996d8a198bdc17b 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -761,13 +761,11 @@ static int nl80211_set_channel(struct sk_buff *skb, struct genl_info *info)
 
        result = get_rdev_dev_by_info_ifindex(info, &rdev, &netdev);
        if (result)
-               goto unlock_rtnl;
+               goto unlock;
 
        result = __nl80211_set_channel(rdev, netdev->ieee80211_ptr, info);
 
-       dev_put(netdev);
-       cfg80211_unlock_rdev(rdev);
- unlock_rtnl:
+ unlock:
        rtnl_unlock();
 
        return result;
@@ -4998,7 +4996,7 @@ static int nl80211_set_cqm_rssi(struct genl_info *info,
 
        err = get_rdev_dev_by_info_ifindex(info, &rdev, &dev);
        if (err)
-               goto unlock_rtnl;
+               goto unlock_rdev;
 
        wdev = dev->ieee80211_ptr;
 
@@ -5015,10 +5013,9 @@ static int nl80211_set_cqm_rssi(struct genl_info *info,
        err = rdev->ops->set_cqm_rssi_config(wdev->wiphy, dev,
                                             threshold, hysteresis);
 
- unlock_rdev:
+unlock_rdev:
        cfg80211_unlock_rdev(rdev);
        dev_put(dev);
- unlock_rtnl:
        rtnl_unlock();
 
        return err;