summaryrefslogtreecommitdiffstats
path: root/drivers/staging/wilc1000/wilc_wlan.c
diff options
context:
space:
mode:
authorGlen Lee <glen.lee@atmel.com>2016-01-25 16:35:09 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-03 15:25:40 -0800
commit5397cbc231e20c8166709e696e70cff08d8ae503 (patch)
treee50973392cbac3a1d4d8ea96be6a668faa0e8116 /drivers/staging/wilc1000/wilc_wlan.c
parent76855ba75fbc0787a5c0d32f991e54c81d2e5ad6 (diff)
downloadop-kernel-dev-5397cbc231e20c8166709e696e70cff08d8ae503.zip
op-kernel-dev-5397cbc231e20c8166709e696e70cff08d8ae503.tar.gz
staging: wilc1000: sdio_init: add resume argument
Part of sdio init codes should not run when sdio init function is called on sdio resume so skip them. Signed-off-by: Glen Lee <glen.lee@atmel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/wilc_wlan.c')
-rw-r--r--drivers/staging/wilc1000/wilc_wlan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 74e2087..36debb4 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1530,7 +1530,7 @@ int wilc_wlan_init(struct net_device *dev)
wilc->quit = 0;
- if (!wilc->hif_func->hif_init(wilc)) {
+ if (!wilc->hif_func->hif_init(wilc, false)) {
ret = -EIO;
goto _fail_;
}
OpenPOWER on IntegriCloud