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

Commit f101d964 authored by Jeffy Chen's avatar Jeffy Chen Committed by Kalle Valo
Browse files

mwifiex: uninit wakeup info in the error handling 



We inited wakeup info at the beginning of mwifiex_add_card, so we need
to uninit it in the error handling.

It's much the same as what we did in:
36908c4e mwifiex: uninit wakeup info when removing device

Signed-off-by: default avatarJeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent f46a5b01

drivers/net/wireless/marvell/mwifiex/main.c

+6 −1
Original line number Diff line number Diff line
@@ -667,8 +667,11 @@ static int _mwifiex_fw_dpc(const struct firmware *firmware, void *context) 
		release_firmware(adapter->firmware);

		adapter->firmware = NULL;

	}

	if (init_failed)

	if (init_failed) {

		if (adapter->irq_wakeup >= 0)

			device_init_wakeup(adapter->dev, false);

		mwifiex_free_adapter(adapter);

	}

	/* Tell all current and future waiters we're finished */

	complete_all(fw_done);
@@ -1668,6 +1671,8 @@ mwifiex_add_card(void *card, struct completion *fw_done, 
		mwifiex_free_cmd_buffers(adapter);

	}

err_kmalloc:

	if (adapter->irq_wakeup >= 0)

		device_init_wakeup(adapter->dev, false);

	mwifiex_free_adapter(adapter);



err_init_sw: