From: Javier Martinez Canillas Date: Fri, 27 May 2016 14:18:20 +0000 (-0400) Subject: mwifiex: check if mwifiex_sdio_probe_of() fails and return error X-Git-Tag: v4.8-rc1~140^2~279^2~21 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=213d9421c165973f6cc9d79e91c8be2de25d0ea0;p=linux.git 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 Reviewed-by: Julian Calaby Signed-off-by: Kalle Valo --- 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);