staging: wilc1000: Fix some double unlock bugs in wilc_wlan_cleanup()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 15 May 2019 09:52:23 +0000 (12:52 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 May 2019 07:26:04 +0000 (09:26 +0200)
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.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/wilc_wlan.c

index 0a71340..95eaf8f 100644 (file)
@@ -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);