Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1408102

[PATCH 6/8] mwifiex: check if mwifiex_sdio_probe_of() fails and return error

Show all headers | View raw

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>
---

 drivers/net/wireless/marvell/mwifiex/sdio.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c
index 1ffbb972318f..1c17e624547a 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);
-- 
2.5.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/8] mwifiex: Fix some error handling issues in mwifiex_sdio_probe() function Javier Martinez Canillas <javier@osg.samsung.com> - 2016-05-27 16:20 +0200
  [PATCH 6/8] mwifiex: check if mwifiex_sdio_probe_of() fails and return error Javier Martinez Canillas <javier@osg.samsung.com> - 2016-05-27 16:20 +0200
  [PATCH 4/8] mwifiex: consolidate mwifiex_sdio_probe() error paths Javier Martinez Canillas <javier@osg.samsung.com> - 2016-05-27 16:20 +0200
  [PATCH 1/8] mwifiex: only call mwifiex_sdio_probe_of() if dev has an OF node Javier Martinez Canillas <javier@osg.samsung.com> - 2016-05-27 16:20 +0200
  [PATCH 8/8] mwifiex: use better message and error code when OF node doesn't match Javier Martinez Canillas <javier@osg.samsung.com> - 2016-05-27 16:20 +0200
  [PATCH 5/8] mwifiex: use dev_err() instead of pr_err() in mwifiex_sdio_probe() Javier Martinez Canillas <javier@osg.samsung.com> - 2016-05-27 16:20 +0200
  [PATCH 7/8] mwifiex: don't print an error if an optional DT property is missing Javier Martinez Canillas <javier@osg.samsung.com> - 2016-05-27 16:30 +0200
  Re: [PATCH 0/8] mwifiex: Fix some error handling issues in  mwifiex_sdio_probe() function Enric Balletbo Serra <eballetbo@gmail.com> - 2016-05-30 12:00 +0200

csiph-web