aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlen Lee <glen.lee@atmel.com>2015-12-21 14:18:28 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-12-21 13:20:04 -0800
commit51d002931b170ea6f056a4c12ae0a9f7233202e5 (patch)
tree59cd41731e7eecd400e773c5861bacab370e89fb
parentstaging: wilc1000: linux_wlan_spi.c: return linux error value (diff)
staging: wilc1000: linux_sdio_probe: use return value
Return ret from wilc_netdev_init instead of -1 for proper error handling. Signed-off-by: Glen Lee <glen.lee@atmel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/wilc1000/linux_wlan_sdio.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/wilc1000/linux_wlan_sdio.c b/drivers/staging/wilc1000/linux_wlan_sdio.c
index e25811d2c5b5..4b9cb5562038 100644
--- a/drivers/staging/wilc1000/linux_wlan_sdio.c
+++ b/drivers/staging/wilc1000/linux_wlan_sdio.c
@@ -91,7 +91,7 @@ static int linux_sdio_probe(struct sdio_func *func,
const struct sdio_device_id *id)
{
struct wilc *wilc;
- int gpio;
+ int gpio, ret;
gpio = -1;
if (IS_ENABLED(CONFIG_WILC1000_HW_OOB_INTR)) {
@@ -101,10 +101,11 @@ static int linux_sdio_probe(struct sdio_func *func,
}
dev_dbg(&func->dev, "Initializing netdev\n");
- if (wilc_netdev_init(&wilc, &func->dev, HIF_SDIO, gpio,
- &wilc_hif_sdio)) {
+ ret = wilc_netdev_init(&wilc, &func->dev, HIF_SDIO, gpio,
+ &wilc_hif_sdio);
+ if (ret) {
dev_err(&func->dev, "Couldn't initialize netdev\n");
- return -1;
+ return ret;
}
sdio_set_drvdata(func, wilc);
wilc->dev = &func->dev;