Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fea69916 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

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



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

Fixes: c5c77ba1 ("staging: wilc1000: Add SDIO/SPI 802.11 driver")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ca641bae

drivers/staging/wilc1000/wilc_wlan.c

+6 −2
Original line number Diff line number Diff line
@@ -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);