Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mv-sheeva.git] / net / wireless / nl80211.c

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 85285b43d3744c5abeef766ba86a6558f974b477..fbfac588297cd248337f9ea2cfd2d1bd52ea686d 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -877,7 +877,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
                int idx, mbm = 0;
 
                if (!rdev->ops->set_tx_power) {
-                       return -EOPNOTSUPP;
+                       result = -EOPNOTSUPP;
                        goto bad_res;
                }