[PATCH wireless-next 04/10] wifi: cw1200: unwind GPIO interrupt setup on error

From: Arthur Heymans

Date: Thu Nov 19 2026 - 12:50:51 EST


If requesting the GPIO interrupt fails, the wake reference and the
card interrupt enables remain set. Drop the wake reference and restore
the original CCCR interrupt-enable byte on the error paths.

Prepared with OpenAI Codex.

Fixes: a910e4a94f69 ("cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets")
Signed-off-by: Arthur Heymans <arthur@xxxxxxxxxxxx>
---
drivers/net/wireless/st/cw1200/cw1200_sdio.c | 38 ++++++++++----------
1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/drivers/net/wireless/st/cw1200/cw1200_sdio.c b/drivers/net/wireless/st/cw1200/cw1200_sdio.c
index 1894359ee9b4..dda201e69735 100644
--- a/drivers/net/wireless/st/cw1200/cw1200_sdio.c
+++ b/drivers/net/wireless/st/cw1200/cw1200_sdio.c
@@ -143,37 +143,35 @@ static irqreturn_t cw1200_gpio_irq(int irq, void *dev_id)
static int cw1200_request_irq(struct hwbus_priv *self)
{
int ret;
- u8 cccr;
+ int err;
+ u8 ien;

- cccr = sdio_f0_readb(self->func, SDIO_CCCR_IENx, &ret);
- if (WARN_ON(ret))
- goto err;
-
- /* Master interrupt enable ... */
- cccr |= BIT(0);
-
- /* ... for our function */
- cccr |= BIT(self->func->num);
+ ien = sdio_f0_readb(self->func, SDIO_CCCR_IENx, &ret);
+ if (ret)
+ return ret;

- sdio_f0_writeb(self->func, cccr, SDIO_CCCR_IENx, &ret);
- if (WARN_ON(ret))
- goto err;
+ sdio_f0_writeb(self->func, ien | BIT(0) | BIT(self->func->num),
+ SDIO_CCCR_IENx, &ret);
+ if (ret)
+ return ret;

ret = enable_irq_wake(self->pdata->irq);
- if (WARN_ON(ret))
- goto err;
+ if (ret)
+ goto restore_ien;

/* Request the IRQ */
ret = request_threaded_irq(self->pdata->irq, cw1200_gpio_hardirq,
cw1200_gpio_irq,
IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
"cw1200_wlan_irq", self);
- if (WARN_ON(ret))
- goto err;
-
- return 0;
+ if (!ret)
+ return 0;

-err:
+ disable_irq_wake(self->pdata->irq);
+restore_ien:
+ sdio_f0_writeb(self->func, ien, SDIO_CCCR_IENx, &err);
+ if (err)
+ dev_warn(&self->func->dev, "cannot restore interrupt enables: %d\n", err);
return ret;
}

--
2.56.0