| Message ID | 1447295726-24486-1-git-send-email-glen.lee@atmel.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
On Thu, Nov 12, 2015 at 11:35:26AM +0900, Glen Lee wrote: > sdio_init and wilc_spi_init always return error, so it fails everytime. > Fix this by removing else statement. > > This fixes c1af9db78950a778ec18343c5c5a6d4cfbf58a61, > bacd388547f55eb415ce266c8723cc6f1281a25d Please fix up how these git commit ids are referenced here and resend. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c index 8aacf55..1addc56 100644 --- a/drivers/staging/wilc1000/wilc_sdio.c +++ b/drivers/staging/wilc1000/wilc_sdio.c @@ -564,8 +564,6 @@ static int sdio_init(struct wilc *wilc, wilc_debug_func func) if (!linux_sdio_init()) { g_sdio.dPrint(N_ERR, "[wilc sdio]: Failed io init bus...\n"); return 0; - } else { - return 0; } /** diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c index 3741836..cff61fd 100644 --- a/drivers/staging/wilc1000/wilc_spi.c +++ b/drivers/staging/wilc1000/wilc_spi.c @@ -968,8 +968,6 @@ static int wilc_spi_init(struct wilc *wilc, wilc_debug_func func) if (!linux_spi_init()) { PRINT_ER("[wilc spi]: Failed io init bus...\n"); return 0; - } else { - return 0; } /**
sdio_init and wilc_spi_init always return error, so it fails everytime. Fix this by removing else statement. This fixes c1af9db78950a778ec18343c5c5a6d4cfbf58a61, bacd388547f55eb415ce266c8723cc6f1281a25d Signed-off-by: Glen Lee <glen.lee@atmel.com> --- drivers/staging/wilc1000/wilc_sdio.c | 2 -- drivers/staging/wilc1000/wilc_spi.c | 2 -- 2 files changed, 4 deletions(-)