diff options
| author |   Javier Martinez Canillas <javier@osg.samsung.com> | 2016-05-27 10:18:20 -0400 |
|---|---|---|
| committer |   Kalle Valo <kvalo@codeaurora.org> | 2016-06-16 18:05:08 +0300 |
| commit | 213d9421c165973f6cc9d79e91c8be2de25d0ea0 (patch) | |
| tree | 0caabd388eda957ac11bf8af570b38fb02f9981d /drivers/net/wireless/marvell/mwifiex/sdio.c | |
| parent | mwifiex: use dev_err() instead of pr_err() in mwifiex_sdio_probe() (diff) | |
| download | linux-dev-213d9421c165973f6cc9d79e91c8be2de25d0ea0.tar.xz linux-dev-213d9421c165973f6cc9d79e91c8be2de25d0ea0.zip | |
mwifiex: check if mwifiex_sdio_probe_of() fails and return error
The function can fail so the returned value should be checked
and the error propagated to the caller in case of a failure.
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Reviewed-by: Julian Calaby <julian.calaby@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/marvell/mwifiex/sdio.c')
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/sdio.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c index e9d90766567f..c38d14f52643 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.c +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c @@ -187,8 +187,13 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id) } /* device tree node parsing and platform specific configuration*/ - if (func->dev.of_node) - mwifiex_sdio_probe_of(&func->dev, card); + if (func->dev.of_node) { + ret = mwifiex_sdio_probe_of(&func->dev, card); + if (ret) { + dev_err(&func->dev, "SDIO dt node parse failed\n"); + goto err_disable; + } + } ret = mwifiex_add_card(card, &add_remove_card_sem, &sdio_ops, MWIFIEX_SDIO); |