diff --git a/[refs] b/[refs]
index c205ec26e876..6931072f47b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f148cfdd9bc29c133d5728d8e98815ba8c01752e
+refs/heads/master: 60ea385ff279a18790a432d57a8302562aaa0f8d
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index a999fc154623..cea595e2ed4d 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/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;
 		}