ath6kl: change || to &&
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 20 Apr 2012 06:43:28 +0000 (09:43 +0300)
committerKalle Valo <kvalo@qca.qualcomm.com>
Mon, 23 Apr 2012 11:36:34 +0000 (14:36 +0300)
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>
drivers/net/wireless/ath/ath6kl/htc_mbox.c

index 065e61516d7a902c02de64c1e43793c931868b7a..086a8e194700cf42e87e28edfb531a218c1018d0 100644 (file)
@@ -758,7 +758,7 @@ static void ath6kl_htc_tx_bundle(struct htc_endpoint *endpoint,
        u32 txb_mask;
        u8 ac = WMM_NUM_AC;
 
-       if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) ||
+       if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) &&
            (WMI_CONTROL_SVC != endpoint->svc_id))
                ac = target->dev->ar->ep2ac_map[endpoint->eid];
 
@@ -866,7 +866,7 @@ static void ath6kl_htc_tx_from_queue(struct htc_target *target,
         */
        INIT_LIST_HEAD(&txq);
 
-       if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) ||
+       if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) &&
            (WMI_CONTROL_SVC != endpoint->svc_id))
                ac = target->dev->ar->ep2ac_map[endpoint->eid];