[PATCH] staging: wilc1000: Fix some double unlock bugs in wilc_wlan_cleanup()

[Dan Carpenter]

If ->hif_read_reg() or ->hif_write_reg() fail then the code unlocks
and keeps executing.  It should just return.

Fixes: c5c77ba18ea6 ("staging: wilc1000: Add SDIO/SPI 802.11 driver")
Signed-off-by: Dan Carpenter <dan.carpen...@oracle.com>
---
 drivers/staging/wilc1000/wilc_wlan.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wlan.c 
b/drivers/staging/wilc1000/wilc_wlan.c
index 0a713409ea98..95eaf8fdf4f2 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1076,13 +1076,17 @@ void wilc_wlan_cleanup(struct net_device *dev)
        acquire_bus(wilc, WILC_BUS_ACQUIRE_AND_WAKEUP);
 
        ret = wilc->hif_func->hif_read_reg(wilc, WILC_GP_REG_0, &reg);
-       if (!ret)
+       if (!ret) {
                release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
+               return;
+       }
 
        ret = wilc->hif_func->hif_write_reg(wilc, WILC_GP_REG_0,
                                        (reg | ABORT_INT));
-       if (!ret)
+       if (!ret) {
                release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
+               return;
+       }
 
        release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
        wilc->hif_func->hif_deinit(NULL);
-- 
2.20.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel