2015-07-02 08:35:38

by Raphael Poggi

Subject: [PATCH] wlcore: sdio: return correct error code

When wlcore_probe_of failed, return the correct error code instead of ENOMEM

Signed-off-by: Raphaël Poggi <[email protected]>
---
drivers/net/wireless/ti/wlcore/sdio.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
index ea7e07a..c172da5 100644
--- a/drivers/net/wireless/ti/wlcore/sdio.c
+++ b/drivers/net/wireless/ti/wlcore/sdio.c
@@ -293,7 +293,8 @@ static int wl1271_probe(struct sdio_func *func,
/* Use block mode for transferring over one block size of data */
func->card->quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE;

- if (wlcore_probe_of(&func->dev, &irq, &pdev_data))
+ ret = wlcore_probe_of(&func->dev, &irq, &pdev_data);
+ if (ret)
goto out_free_glue;

/* if sdio can keep power while host is suspended, enable wow */
--
2.1.0

2015-07-16 09:03:50

by Raphael Poggi

Subject: Re: [PATCH] wlcore: sdio: return correct error code

Ping ?

2015-07-02 10:34 GMT+02:00 Raphael Poggi <[email protected]>:
> When wlcore_probe_of failed, return the correct error code instead of ENOMEM
>
> Signed-off-by: Raphaël Poggi <[email protected]>
> ---
> drivers/net/wireless/ti/wlcore/sdio.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
> index ea7e07a..c172da5 100644
> --- a/drivers/net/wireless/ti/wlcore/sdio.c
> +++ b/drivers/net/wireless/ti/wlcore/sdio.c
> @@ -293,7 +293,8 @@ static int wl1271_probe(struct sdio_func *func,
> /* Use block mode for transferring over one block size of data */
> func->card->quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE;
>
> - if (wlcore_probe_of(&func->dev, &irq, &pdev_data))
> + ret = wlcore_probe_of(&func->dev, &irq, &pdev_data);
> + if (ret)
> goto out_free_glue;
>
> /* if sdio can keep power while host is suspended, enable wow */
> --
> 2.1.0
>

2015-07-21 13:56:30

by Kalle Valo

Subject: Re: wlcore: sdio: return correct error code

> When wlcore_probe_of failed, return the correct error code instead of ENOMEM
>
> Signed-off-by: Raphaël Poggi <[email protected]>

Thanks, applied to wireless-drivers-next.git.

Kalle Valo