From 255f76c6bced8a453b6912e7e995538d0d36a0e1 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sun, 9 Aug 2009 14:24:09 +0200
Subject: [PATCH] --- yaml --- r: 156896 b: refs/heads/master c:
 e9d126cdfa60b575f1b5b02024c4faee27dccf07 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/ath/ar9170/main.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index af5e8dc2db92..289c154335a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 363ec5614f86110c6a6bdd72ac2147ebafd3ff5e
+refs/heads/master: e9d126cdfa60b575f1b5b02024c4faee27dccf07
diff --git a/trunk/drivers/net/wireless/ath/ar9170/main.c b/trunk/drivers/net/wireless/ath/ar9170/main.c
index 9d38cf60a0db..88c3d8573869 100644
--- a/trunk/drivers/net/wireless/ath/ar9170/main.c
+++ b/trunk/drivers/net/wireless/ath/ar9170/main.c
@@ -1967,13 +1967,14 @@ static int ar9170_conf_tx(struct ieee80211_hw *hw, u16 queue,
 	int ret;
 
 	mutex_lock(&ar->mutex);
-	if ((param) && !(queue > __AR9170_NUM_TXQ)) {
+	if (queue < __AR9170_NUM_TXQ) {
 		memcpy(&ar->edcf[ar9170_qos_hwmap[queue]],
 		       param, sizeof(*param));
 
 		ret = ar9170_set_qos(ar);
-	} else
+	} else {
 		ret = -EINVAL;
+	}
 
 	mutex_unlock(&ar->mutex);
 	return ret;