diff mbox

ieee802154: mrf24j40: fix incorrect mask in mrf24j40_stop

Message ID 20171031063127.GA6032@embeddedor.com (mailing list archive)
State Accepted
Headers show

Commit Message

Gustavo A. R. Silva Oct. 31, 2017, 6:31 a.m. UTC 
It seems that this is a copy/paste error and the proper bit masking is:
BIT_TXNIE | BIT_RXIE

This issue was detected with the help of Coccinelle.

Reported-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
Fixes: 7d840545e5b9 ("mrf24j40: replace magic numbers")
---
 drivers/net/ieee802154/mrf24j40.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stefan Schmidt Nov. 6, 2017, 11:13 a.m. UTC | #1 
Hello Alan.

On 10/31/2017 07:31 AM, Gustavo A. R. Silva wrote:
> It seems that this is a copy/paste error and the proper bit masking is:
> BIT_TXNIE | BIT_RXIE
> 
> This issue was detected with the help of Coccinelle.
> 
> Reported-by: Julia Lawall <julia.lawall@lip6.fr>
> Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
> Fixes: 7d840545e5b9 ("mrf24j40: replace magic numbers")
> ---
>  drivers/net/ieee802154/mrf24j40.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
> index ee7084b..cf4788d 100644
> --- a/drivers/net/ieee802154/mrf24j40.c
> +++ b/drivers/net/ieee802154/mrf24j40.c
> @@ -635,7 +635,7 @@ static void mrf24j40_stop(struct ieee802154_hw *hw)
>  
>  	/* Set TXNIE and RXIE. Disable Interrupts */
>  	regmap_update_bits(devrec->regmap_short, REG_INTCON,
> -			   BIT_TXNIE | BIT_TXNIE, BIT_TXNIE | BIT_TXNIE);
> +			   BIT_TXNIE | BIT_RXIE, BIT_TXNIE | BIT_RXIE);
>  }
>  
>  static int mrf24j40_set_channel(struct ieee802154_hw *hw, u8 page, u8 channel)
> 

Could you review this and give me your ack when you are happy so I can apply it to my tree?

regards
Stefan Schmidt
--
To unsubscribe from this list: send the line "unsubscribe linux-wpan" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alan Ott Nov. 6, 2017, 2:36 p.m. UTC | #2 
On 11/06/2017 06:13 AM, Stefan Schmidt wrote:
> Hello Alan.
>
> On 10/31/2017 07:31 AM, Gustavo A. R. Silva wrote:
>> It seems that this is a copy/paste error and the proper bit masking is:
>> BIT_TXNIE | BIT_RXIE
>>
>> This issue was detected with the help of Coccinelle.
>>
>> Reported-by: Julia Lawall <julia.lawall@lip6.fr>
>> Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
>> Fixes: 7d840545e5b9 ("mrf24j40: replace magic numbers")
>> ---
>>  drivers/net/ieee802154/mrf24j40.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
>> index ee7084b..cf4788d 100644
>> --- a/drivers/net/ieee802154/mrf24j40.c
>> +++ b/drivers/net/ieee802154/mrf24j40.c
>> @@ -635,7 +635,7 @@ static void mrf24j40_stop(struct ieee802154_hw *hw)
>>
>>  	/* Set TXNIE and RXIE. Disable Interrupts */
>>  	regmap_update_bits(devrec->regmap_short, REG_INTCON,
>> -			   BIT_TXNIE | BIT_TXNIE, BIT_TXNIE | BIT_TXNIE);
>> +			   BIT_TXNIE | BIT_RXIE, BIT_TXNIE | BIT_RXIE);
>>  }
>>
>>  static int mrf24j40_set_channel(struct ieee802154_hw *hw, u8 page, u8 channel)
>>
>
> Could you review this and give me your ack when you are happy so I can apply it to my tree?
>

Acked-by: Alan Ott <alan@signal11.us>

--
To unsubscribe from this list: send the line "unsubscribe linux-wpan" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Stefan Schmidt Nov. 6, 2017, 3:33 p.m. UTC | #3 
Hello.

On 31.10.2017 07:31, Gustavo A. R. Silva wrote:
> It seems that this is a copy/paste error and the proper bit masking is:
> BIT_TXNIE | BIT_RXIE
> 
> This issue was detected with the help of Coccinelle.
> 
> Reported-by: Julia Lawall <julia.lawall@lip6.fr>
> Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
> Fixes: 7d840545e5b9 ("mrf24j40: replace magic numbers")
> ---
>  drivers/net/ieee802154/mrf24j40.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
> index ee7084b..cf4788d 100644
> --- a/drivers/net/ieee802154/mrf24j40.c
> +++ b/drivers/net/ieee802154/mrf24j40.c
> @@ -635,7 +635,7 @@ static void mrf24j40_stop(struct ieee802154_hw *hw)
>  
>  	/* Set TXNIE and RXIE. Disable Interrupts */
>  	regmap_update_bits(devrec->regmap_short, REG_INTCON,
> -			   BIT_TXNIE | BIT_TXNIE, BIT_TXNIE | BIT_TXNIE);
> +			   BIT_TXNIE | BIT_RXIE, BIT_TXNIE | BIT_RXIE);
>  }
>  
>  static int mrf24j40_set_channel(struct ieee802154_hw *hw, u8 page, u8 channel)
> 

This patch has been applied to the wpan-next tree and will be
part of the next pull request to net-next. Thanks!

regards
Stefan Schmidt
--
To unsubscribe from this list: send the line "unsubscribe linux-wpan" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index ee7084b..cf4788d 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -635,7 +635,7 @@  static void mrf24j40_stop(struct ieee802154_hw *hw)
 
 	/* Set TXNIE and RXIE. Disable Interrupts */
 	regmap_update_bits(devrec->regmap_short, REG_INTCON,
-			   BIT_TXNIE | BIT_TXNIE, BIT_TXNIE | BIT_TXNIE);
+			   BIT_TXNIE | BIT_RXIE, BIT_TXNIE | BIT_RXIE);
 }
 
 static int mrf24j40_set_channel(struct ieee802154_hw *hw, u8 page, u8 channel)