aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/wilc1000/wilc_spi.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_spi.c
parentstaging: wilc1000: add sdio resume/suspend (diff)
downloadlinux-dev-5397cbc231e20c8166709e696e70cff08d8ae503.tar.xz
linux-dev-5397cbc231e20c8166709e696e70cff08d8ae503.zip
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_spi.c')
-rw-r--r--drivers/staging/wilc1000/wilc_spi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c
index 1df07e7bea59..29287122d1ca 100644
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -850,7 +850,7 @@ static int _wilc_spi_deinit(struct wilc *wilc)
return 1;
}
-static int wilc_spi_init(struct wilc *wilc)
+static int wilc_spi_init(struct wilc *wilc, bool resume)
{
struct spi_device *spi = to_spi_device(wilc->dev);
u32 reg;