aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath6kl/htc_mbox.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-04-20 02:43:28 -0400
committerKalle Valo <kvalo@qca.qualcomm.com>2012-04-23 07:36:34 -0400
commit3acabc88072341a0ef6ad8ce5aee3af7429ac522 (patch)
tree5d3c92d11cedc74802e77ab7f1921d5f3d25c97b /drivers/net/wireless/ath/ath6kl/htc_mbox.c
parent77ed4e45833fc12f3178a65853687b60e952eddd (diff)
ath6kl: change || to &&
The original conditions are always true. I think && was intended here, but I don't have the hardware to test. Could you take a look? kvalo: Chilam confirmed that the fix is valid Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/htc_mbox.c')
-rw-r--r--drivers/net/wireless/ath/ath6kl/htc_mbox.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/htc_mbox.c b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
index 065e61516d7a..086a8e194700 100644
--- a/drivers/net/wireless/ath/ath6kl/htc_mbox.c
+++ b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
@@ -758,7 +758,7 @@ static void ath6kl_htc_tx_bundle(struct htc_endpoint *endpoint,
758 u32 txb_mask; 758 u32 txb_mask;
759 u8 ac = WMM_NUM_AC; 759 u8 ac = WMM_NUM_AC;
760 760
761 if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) || 761 if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) &&
762 (WMI_CONTROL_SVC != endpoint->svc_id)) 762 (WMI_CONTROL_SVC != endpoint->svc_id))
763 ac = target->dev->ar->ep2ac_map[endpoint->eid]; 763 ac = target->dev->ar->ep2ac_map[endpoint->eid];
764 764
@@ -866,7 +866,7 @@ static void ath6kl_htc_tx_from_queue(struct htc_target *target,
866 */ 866 */
867 INIT_LIST_HEAD(&txq); 867 INIT_LIST_HEAD(&txq);
868 868
869 if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) || 869 if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) &&
870 (WMI_CONTROL_SVC != endpoint->svc_id)) 870 (WMI_CONTROL_SVC != endpoint->svc_id))
871 ac = target->dev->ar->ep2ac_map[endpoint->eid]; 871 ac = target->dev->ar->ep2ac_map[endpoint->eid];
872 872