| Message ID | 1464358702-19083-4-git-send-email-javier@osg.samsung.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 032e0f546c7e36217ebcae33f82d390c272d00ea |
| Delegated to: | Kalle Valo |
| Headers | show |
Hi All, On Sat, May 28, 2016 at 12:18 AM, Javier Martinez Canillas <javier@osg.samsung.com> wrote: > There's only a check if mwifiex_add_card() returned a nonzero value, but > the actual error code is neither stored nor propagated to the caller. So > instead of always returning -1 (which is -EPERM and not a suitable errno > code in this case), propagate the value returned by mwifiex_add_card(). > > Patch also removes the assignment of sdio_disable_func() returned value > since it was overwritten anyways and what matters is to know the error > value returned by the first function that failed. > > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> This looks sensible to me. Reviewed-by: Julian Calaby <julian.calaby@gmail.com> > --- > > drivers/net/wireless/marvell/mwifiex/sdio.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Thanks,
diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c index ab64507c84e1..81003fbe5025 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.c +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c @@ -191,14 +191,14 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id) if (func->dev.of_node) mwifiex_sdio_probe_of(&func->dev, card); - if (mwifiex_add_card(card, &add_remove_card_sem, &sdio_ops, - MWIFIEX_SDIO)) { + ret = mwifiex_add_card(card, &add_remove_card_sem, &sdio_ops, + MWIFIEX_SDIO); + if (ret) { pr_err("%s: add card failed\n", __func__); kfree(card); sdio_claim_host(func); - ret = sdio_disable_func(func); + sdio_disable_func(func); sdio_release_host(func); - ret = -1; } return ret;
There's only a check if mwifiex_add_card() returned a nonzero value, but the actual error code is neither stored nor propagated to the caller. So instead of always returning -1 (which is -EPERM and not a suitable errno code in this case), propagate the value returned by mwifiex_add_card(). Patch also removes the assignment of sdio_disable_func() returned value since it was overwritten anyways and what matters is to know the error value returned by the first function that failed. Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> --- drivers/net/wireless/marvell/mwifiex/sdio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)