From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794064130; b=Xyw3BAZAOT1H0ULTMgx2xOXlD/YTdfcOrpah07Fi8sfiWeybyiLfOiYvodxZf1uv0weZ lga3T7EvbrxCzQy/0u7bv4va8q/ZNgUxNluVEFscS7fWzsoqwDHgM/qRBt470D2TYP9Xo KFTx1F0sPPWhPxUwUKQkFrkx2lZeuDDuf+s9GrdEV/V4ngzVICsyKTISueJ9Drnrg9UEf QYyL5ipLItylE+ow8ukcgnr/Pe4ZA2dr5o2KkkW9Q4OHe1qRVLE1O85+gmAv/Wf0rOB9L z53dqeZQDINM0D9yzAvR0LlGbc//yp3ZwJkvEpFu0VSJcJfXQUTfPd5CRHfp5OeksDg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794064130; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=vLwVoV0Y00FnJjKyqF/LfiWVod5PzR5aY6Ha7JK9BFE=; b=F5xuu7ErsnG3PDyWDNItCOSTJTjklrRhA/f2eY4IS67SgOJmyK5kBmpbQYOVDSpvOi8W Jd3oylFq/IJVcEbOvRwloWALP867vnIh6sWuOOOr0S7aCV6L0ndTrGbEow2WCxl/ftEuF MQ8zbJ/xrJQgH6AhAuh2EAwl7XVP1/5pr6u3PoAPJ36SuSaECk4BPD2blvg3VJxQ7cLbM GawNZ1eYglV2U+7T2/h7sIVAQHO1WlIRsQdKRr/cqjs6PIjru9AcPz1k5/Gg30cw8fkru oyWrnVNR8DAoF6UW4ZrcW5a9Vl370092pjr3jzRzK6O1TDufBetZFBN1/H99zlbyURQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=sCqgcc9W; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3F1A0606A330; Sat, 7 Nov 2026 15:08:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=sCqgcc9W Received: by smtp.kernel.org (Postfix) with ESMTPSA id D69BF1F0089F; Sat, 7 Nov 2026 15:08:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794064130; bh=vLwVoV0Y00FnJjKyqF/LfiWVod5PzR5aY6Ha7JK9BFE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sCqgcc9WcRiQDv/qU4Q4r3M/oXS/kYaqOOcTHomAf5+wE2mb6lKqPeN+S2215TU9g tqchk0+55PrDFeHIfVGomj5eEonBjRXCpoDF5uC4+wLigF1KESJCsyqA2RAravG53H dwRBOdK6PaRo6a8ZFXzibujdoJmq81PMPEomkpM8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lee Jones , Hongyan Xu , Sasha Levin Subject: [PATCH 7.3 0282/1257] mfd: da903x: Cancel IRQ work during teardown Date: Sat, 7 Nov 2026 08:42:58 -0500 Message-ID: <20261107134947.262891286@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134939.434104957@linuxfoundation.org> References: <20261107134939.434104957@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hongyan Xu [ Upstream commit fd2258999ecdc7164ef0cda2d4102e4558a5660f ] The IRQ handler disables the IRQ and schedules irq_work. Releasing the IRQ does not drain that work, which can continue to use the devm-allocated chip and notifier state. Manage both IRQ-work cancellation and subdevice removal with devres. Register the subdevice-removal action before requesting the IRQ, then add the IRQ-work action after the request. This avoids leaving a live IRQ without work cancellation if action registration fails. Devres cleanup then disables the IRQ and drains the work before releasing the IRQ and removing child devices. Register both actions before creating the children so partial probe failures use the same ordering. This issue was found by the author's in-house static analysis tool. The patch was reviewed by the author against the latest mainline tree. Fixes: 26b8f5e1e2d1 ("mfd: add base support for Dialog DA9030/DA9034 PMICs") Cc: stable@vger.kernel.org Suggested-by: Lee Jones Assisted-by: Codex:GPT-5 Signed-off-by: Hongyan Xu Link: https://patch.msgid.link/20260814153019.1114-1-getshell@seu.edu.cn Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/mfd/da903x.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c index e86b39de3303a..e4ad48e1f139b 100644 --- a/drivers/mfd/da903x.c +++ b/drivers/mfd/da903x.c @@ -421,6 +421,14 @@ static irqreturn_t da903x_irq_handler(int irq, void *data) return IRQ_HANDLED; } +static void da903x_cancel_irq_work(void *data) +{ + struct da903x_chip *chip = data; + + disable_irq(chip->client->irq); + cancel_work_sync(&chip->irq_work); +} + static const struct da903x_chip_ops da903x_ops[] = { [0] = { .init_chip = da9030_init_chip, @@ -456,6 +464,13 @@ static int da903x_remove_subdevs(struct da903x_chip *chip) return device_for_each_child(chip->dev, NULL, __remove_subdev); } +static void da903x_remove_subdevs_action(void *data) +{ + struct da903x_chip *chip = data; + + da903x_remove_subdevs(chip); +} + static int da903x_add_subdevs(struct da903x_chip *chip, struct da903x_platform_data *pdata) { @@ -484,7 +499,6 @@ static int da903x_add_subdevs(struct da903x_chip *chip, return 0; failed: - da903x_remove_subdevs(chip); return ret; } @@ -520,6 +534,11 @@ static int da903x_probe(struct i2c_client *client) chip->ops->mask_events(chip, chip->events_mask); chip->ops->read_events(chip, &tmp); + ret = devm_add_action_or_reset(&client->dev, + da903x_remove_subdevs_action, chip); + if (ret) + return ret; + ret = devm_request_irq(&client->dev, client->irq, da903x_irq_handler, IRQF_TRIGGER_FALLING, "da903x", chip); @@ -529,14 +548,12 @@ static int da903x_probe(struct i2c_client *client) return ret; } - return da903x_add_subdevs(chip, pdata); -} - -static void da903x_remove(struct i2c_client *client) -{ - struct da903x_chip *chip = i2c_get_clientdata(client); + ret = devm_add_action_or_reset(&client->dev, da903x_cancel_irq_work, + chip); + if (ret) + return ret; - da903x_remove_subdevs(chip); + return da903x_add_subdevs(chip, pdata); } static struct i2c_driver da903x_driver = { @@ -544,7 +561,6 @@ static struct i2c_driver da903x_driver = { .name = "da903x", }, .probe = da903x_probe, - .remove = da903x_remove, .id_table = da903x_id_table, }; -- 2.53.0