diff mbox series

wilc1000: write value to WILC_INTR2_ENABLE register

Message ID 20210224163706.519658-1-marcus.folkesson@gmail.com (mailing list archive)
State Awaiting Upstream
Delegated to: Netdev Maintainers
Headers show
Series wilc1000: write value to WILC_INTR2_ENABLE register | expand

Checks

Context Check Description
netdev/tree_selection success Not a local patch

Commit Message

Marcus Folkesson Feb. 24, 2021, 4:37 p.m. UTC
Write the value instead of reading it twice.

Fixes: 5e63a598441a ("staging: wilc1000: added 'wilc_' prefix for function in wilc_sdio.c file")

Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
 drivers/net/wireless/microchip/wilc1000/sdio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Kalle Valo Feb. 24, 2021, 4:43 p.m. UTC | #1
Marcus Folkesson <marcus.folkesson@gmail.com> writes:

> Write the value instead of reading it twice.
>
> Fixes: 5e63a598441a ("staging: wilc1000: added 'wilc_' prefix for function in wilc_sdio.c file")
>
> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
> ---
>  drivers/net/wireless/microchip/wilc1000/sdio.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
> index 351ff909ab1c..e14b9fc2c67a 100644
> --- a/drivers/net/wireless/microchip/wilc1000/sdio.c
> +++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
> @@ -947,7 +947,7 @@ static int wilc_sdio_sync_ext(struct wilc *wilc, int nint)
>  			for (i = 0; (i < 3) && (nint > 0); i++, nint--)
>  				reg |= BIT(i);
>  
> -			ret = wilc_sdio_read_reg(wilc, WILC_INTR2_ENABLE, &reg);
> +			ret = wilc_sdio_write_reg(wilc, WILC_INTR2_ENABLE, reg);

To me it looks like the bug existed before commit 5e63a598441a:

-			ret = sdio_read_reg(wilc, WILC_INTR2_ENABLE, &reg);
+			ret = wilc_sdio_read_reg(wilc, WILC_INTR2_ENABLE, &reg);

https://git.kernel.org/linus/5e63a598441a
Ajay Singh Feb. 25, 2021, 5:06 a.m. UTC | #2
On 24/02/21 10:13 pm, Kalle Valo wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> Marcus Folkesson <marcus.folkesson@gmail.com> writes:
> 
>> Write the value instead of reading it twice.
>>
>> Fixes: 5e63a598441a ("staging: wilc1000: added 'wilc_' prefix for function in wilc_sdio.c file")
>>
>> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
>> ---
>>  drivers/net/wireless/microchip/wilc1000/sdio.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
>> index 351ff909ab1c..e14b9fc2c67a 100644
>> --- a/drivers/net/wireless/microchip/wilc1000/sdio.c
>> +++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
>> @@ -947,7 +947,7 @@ static int wilc_sdio_sync_ext(struct wilc *wilc, int nint)
>>                       for (i = 0; (i < 3) && (nint > 0); i++, nint--)
>>                               reg |= BIT(i);
>>
>> -                     ret = wilc_sdio_read_reg(wilc, WILC_INTR2_ENABLE, &reg);
>> +                     ret = wilc_sdio_write_reg(wilc, WILC_INTR2_ENABLE, reg);
> 
> To me it looks like the bug existed before commit 5e63a598441a:


Yes, you are correct. The bug existed from commit c5c77ba18ea6:

https://git.kernel.org/linus/c5c77ba18ea6

Regards,
Ajay

> 
> -                       ret = sdio_read_reg(wilc, WILC_INTR2_ENABLE, &reg);
> +                       ret = wilc_sdio_read_reg(wilc, WILC_INTR2_ENABLE, &reg);
> 
> https://git.kernel.org/linus/5e63a598441a
> 
> --
> https://patchwork.kernel.org/project/linux-wireless/list/
> 
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
>
Kalle Valo Feb. 25, 2021, 7:09 a.m. UTC | #3
<Ajay.Kathat@microchip.com> writes:

> On 24/02/21 10:13 pm, Kalle Valo wrote:
>> EXTERNAL EMAIL: Do not click links or open attachments unless you
>> know the content is safe
>> 
>> Marcus Folkesson <marcus.folkesson@gmail.com> writes:
>> 
>>> Write the value instead of reading it twice.
>>>
>>> Fixes: 5e63a598441a ("staging: wilc1000: added 'wilc_' prefix for function in wilc_sdio.c file")
>>>
>>> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
>>> ---
>>>  drivers/net/wireless/microchip/wilc1000/sdio.c | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
>>> index 351ff909ab1c..e14b9fc2c67a 100644
>>> --- a/drivers/net/wireless/microchip/wilc1000/sdio.c
>>> +++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
>>> @@ -947,7 +947,7 @@ static int wilc_sdio_sync_ext(struct wilc *wilc, int nint)
>>>                       for (i = 0; (i < 3) && (nint > 0); i++, nint--)
>>>                               reg |= BIT(i);
>>>
>>> -                     ret = wilc_sdio_read_reg(wilc, WILC_INTR2_ENABLE, &reg);
>>> +                     ret = wilc_sdio_write_reg(wilc, WILC_INTR2_ENABLE, reg);
>> 
>> To me it looks like the bug existed before commit 5e63a598441a:
>
>
> Yes, you are correct. The bug existed from commit c5c77ba18ea6:
>
> https://git.kernel.org/linus/c5c77ba18ea6

So the fixes tag should be:

Fixes: c5c77ba18ea6 ("staging: wilc1000: Add SDIO/SPI 802.11 driver")

I can change that during commit, ok?
Ajay Singh Feb. 25, 2021, 7:35 a.m. UTC | #4
On 25/02/21 12:39 pm, Kalle Valo wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> <Ajay.Kathat@microchip.com> writes:
> 
>> On 24/02/21 10:13 pm, Kalle Valo wrote:
>>> EXTERNAL EMAIL: Do not click links or open attachments unless you
>>> know the content is safe
>>>
>>> Marcus Folkesson <marcus.folkesson@gmail.com> writes:
>>>
>>>> Write the value instead of reading it twice.
>>>>
>>>> Fixes: 5e63a598441a ("staging: wilc1000: added 'wilc_' prefix for function in wilc_sdio.c file")
>>>>
>>>> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
>>>> ---
>>>>  drivers/net/wireless/microchip/wilc1000/sdio.c | 2 +-
>>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
>>>> index 351ff909ab1c..e14b9fc2c67a 100644
>>>> --- a/drivers/net/wireless/microchip/wilc1000/sdio.c
>>>> +++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
>>>> @@ -947,7 +947,7 @@ static int wilc_sdio_sync_ext(struct wilc *wilc, int nint)
>>>>                       for (i = 0; (i < 3) && (nint > 0); i++, nint--)
>>>>                               reg |= BIT(i);
>>>>
>>>> -                     ret = wilc_sdio_read_reg(wilc, WILC_INTR2_ENABLE, &reg);
>>>> +                     ret = wilc_sdio_write_reg(wilc, WILC_INTR2_ENABLE, reg);
>>>
>>> To me it looks like the bug existed before commit 5e63a598441a:
>>
>>
>> Yes, you are correct. The bug existed from commit c5c77ba18ea6:
>>
>> https://git.kernel.org/linus/c5c77ba18ea6
> 
> So the fixes tag should be:
> 
> Fixes: c5c77ba18ea6 ("staging: wilc1000: Add SDIO/SPI 802.11 driver")
> 
> I can change that during commit, ok?

Yes. Thanks.

Regards,
Ajay
Marcus Folkesson Feb. 25, 2021, 8:02 a.m. UTC | #5
Hi,

On Thu, Feb 25, 2021 at 09:09:30AM +0200, Kalle Valo wrote:
> <Ajay.Kathat@microchip.com> writes:
> 
> > On 24/02/21 10:13 pm, Kalle Valo wrote:
> >> EXTERNAL EMAIL: Do not click links or open attachments unless you
> >> know the content is safe
> >> 
> >> Marcus Folkesson <marcus.folkesson@gmail.com> writes:
> >> 
> >>> Write the value instead of reading it twice.
> >>>
> >>> Fixes: 5e63a598441a ("staging: wilc1000: added 'wilc_' prefix for function in wilc_sdio.c file")
> >>>
> >>> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
> >>> ---
> >>>  drivers/net/wireless/microchip/wilc1000/sdio.c | 2 +-
> >>>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>>
> >>> diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
> >>> index 351ff909ab1c..e14b9fc2c67a 100644
> >>> --- a/drivers/net/wireless/microchip/wilc1000/sdio.c
> >>> +++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
> >>> @@ -947,7 +947,7 @@ static int wilc_sdio_sync_ext(struct wilc *wilc, int nint)
> >>>                       for (i = 0; (i < 3) && (nint > 0); i++, nint--)
> >>>                               reg |= BIT(i);
> >>>
> >>> -                     ret = wilc_sdio_read_reg(wilc, WILC_INTR2_ENABLE, &reg);
> >>> +                     ret = wilc_sdio_write_reg(wilc, WILC_INTR2_ENABLE, reg);
> >> 
> >> To me it looks like the bug existed before commit 5e63a598441a:
> >
> >
> > Yes, you are correct. The bug existed from commit c5c77ba18ea6:
> >
> > https://git.kernel.org/linus/c5c77ba18ea6
> 
> So the fixes tag should be:
> 
> Fixes: c5c77ba18ea6 ("staging: wilc1000: Add SDIO/SPI 802.11 driver")

You are right.

> 
> I can change that during commit, ok?

Please do, thanks!

> 
> -- 
> https://patchwork.kernel.org/project/linux-wireless/list/
> 
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Best regards
Marcus Folkesson
Kalle Valo March 15, 2021, 8:26 a.m. UTC | #6
Marcus Folkesson <marcus.folkesson@gmail.com> wrote:

> Write the value instead of reading it twice.
> 
> Fixes: c5c77ba18ea6 ("staging: wilc1000: Add SDIO/SPI 802.11 driver")
> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>

Patch applied to wireless-drivers-next.git, thanks.

e21b6e5a5462 wilc1000: write value to WILC_INTR2_ENABLE register
diff mbox series

Patch

diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
index 351ff909ab1c..e14b9fc2c67a 100644
--- a/drivers/net/wireless/microchip/wilc1000/sdio.c
+++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
@@ -947,7 +947,7 @@  static int wilc_sdio_sync_ext(struct wilc *wilc, int nint)
 			for (i = 0; (i < 3) && (nint > 0); i++, nint--)
 				reg |= BIT(i);
 
-			ret = wilc_sdio_read_reg(wilc, WILC_INTR2_ENABLE, &reg);
+			ret = wilc_sdio_write_reg(wilc, WILC_INTR2_ENABLE, reg);
 			if (ret) {
 				dev_err(&func->dev,
 					"Failed write reg (%08x)...\n",