diff --git a/[refs] b/[refs]
index 1c3861f62b6b..503f69596202 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4797938c5dfa22af30fd16679192972f878419a1
+refs/heads/master: e9aeabaeb9a0bece50100dc74bbd720a68cb8f5c
diff --git a/trunk/net/mac80211/wext.c b/trunk/net/mac80211/wext.c
index 5690c3d41e7d..3fc1b903bfbc 100644
--- a/trunk/net/mac80211/wext.c
+++ b/trunk/net/mac80211/wext.c
@@ -853,9 +853,12 @@ static int ieee80211_ioctl_siwpower(struct net_device *dev,
 		ps = true;
 		break;
 	default:                /* Otherwise we ignore */
-		break;
+		return -EINVAL;
 	}
 
+	if (wrq->flags & ~(IW_POWER_MODE | IW_POWER_TIMEOUT))
+		return -EINVAL;
+
 	if (wrq->flags & IW_POWER_TIMEOUT)
 		timeout = wrq->value / 1000;