Re: [patch 1/2] ath6kl: change || to &&

[Kalle Valo <kvalo@xxxxxxxxxxxxxxxx>]

On 04/20/2012 09:43 AM, Dan Carpenter wrote:
> 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?
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> 
> diff --git a/drivers/net/wireless/ath/ath6kl/htc_mbox.c b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
> index 065e615..086a8e1 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,
>  	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];

Dan, that's a good catch. This is coming from Chilam's patch:

https://github.com/kvalo/ath6kl/commit/b29072cc7b0e08ace48ab709c40cf6246fb2e8b0

Chilam, is it safe to take Dan's patch?

Kalle
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html