Commit a8311c8a authored by Ido Yariv's avatar Ido Yariv Committed by Luciano Coelho
Browse files

wlcore: Fix unbalanced interrupts enablement 



The interrupt line is enabled by wl12xx_enable_interrupts and
wl18xx_enable_interrupts, but it will not be disabled in all failure
paths. Fix this.

Signed-off-by: default avatarIdo Yariv <ido@wizery.com>
Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarLuciano Coelho <luca@coelho.fi>
parent 792a58a8

drivers/net/wireless/ti/wl12xx/main.c

+8 −1
Original line number Diff line number Diff line
@@ -1184,9 +1184,16 @@ static int wl12xx_enable_interrupts(struct wl1271 *wl) 
	ret = wlcore_write_reg(wl, REG_INTERRUPT_MASK,

			       WL1271_ACX_INTR_ALL & ~(WL12XX_INTR_MASK));

	if (ret < 0)

		goto out;

		goto disable_interrupts;



	ret = wlcore_write32(wl, WL12XX_HI_CFG, HI_CFG_DEF_VAL);

	if (ret < 0)

		goto disable_interrupts;



	return ret;



disable_interrupts:

	wlcore_disable_interrupts(wl);



out:

	return ret;

drivers/net/wireless/ti/wl18xx/main.c

+7 −0
Original line number Diff line number Diff line
@@ -811,6 +811,13 @@ static int wl18xx_enable_interrupts(struct wl1271 *wl) 


	ret = wlcore_write_reg(wl, REG_INTERRUPT_MASK,

			       WL1271_ACX_INTR_ALL & ~intr_mask);

	if (ret < 0)

		goto disable_interrupts;



	return ret;



disable_interrupts:

	wlcore_disable_interrupts(wl);



out:

	return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE