2021-02-24 16:41:21

by Marcus Folkesson

[permalink] [raw]

Subject: [PATCH] wilc1000: write value to WILC_INTR2_ENABLE register

---

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 <[email protected]>
---
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);
if (ret) {
dev_err(&func->dev,
"Failed write reg (%08x)...\n",
--
2.30.0

2021-02-24 16:45:29

by Kalle Valo

[permalink] [raw]

Subject: Re: [PATCH] wilc1000: write value to WILC_INTR2_ENABLE register

---

Marcus Folkesson <[email protected]> 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 <[email protected]>
> ---
> 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

--
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

2021-02-25 09:47:48

by Marcus Folkesson

[permalink] [raw]

Subject: Re: [PATCH] wilc1000: write value to WILC_INTR2_ENABLE register

---

Hi,

On Thu, Feb 25, 2021 at 09:09:30AM +0200, Kalle Valo wrote:
> <[email protected]> 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 <[email protected]> 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 <[email protected]>
> >>> ---
> >>> 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

---

Attachments:

(No filename) (1.94 kB)
signature.asc (849.00 B)
Download all attachments

2021-03-15 08:27:33

by Kalle Valo

[permalink] [raw]

Subject: Re: wilc1000: write value to WILC_INTR2_ENABLE register

---

Marcus Folkesson <[email protected]> wrote:

> Write the value instead of reading it twice.
>
> Fixes: c5c77ba18ea6 ("staging: wilc1000: Add SDIO/SPI 802.11 driver")
> Signed-off-by: Marcus Folkesson <[email protected]>

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

e21b6e5a5462 wilc1000: write value to WILC_INTR2_ENABLE register

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches