git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
ath
/
ar9170
/
main.c
diff --git
a/drivers/net/wireless/ath/ar9170/main.c
b/drivers/net/wireless/ath/ar9170/main.c
index
9d38cf6
..
88c3d85
100644
(file)
--- a/
drivers/net/wireless/ath/ar9170/main.c
+++ b/
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);
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);
memcpy(&ar->edcf[ar9170_qos_hwmap[queue]],
param, sizeof(*param));
ret = ar9170_set_qos(ar);
- } else
+ } else
{
ret = -EINVAL;
ret = -EINVAL;
+ }
mutex_unlock(&ar->mutex);
return ret;
mutex_unlock(&ar->mutex);
return ret;