[PATCH] iio: light: gp2ap002: Disable regulators on resume failure

[PATCH] iio: light: gp2ap002: Disable regulators on resume failure

[Laxman Acharya Padhya]

If enabling VIO fails after VDD has been enabled, runtime resume
returns without disabling VDD. Likewise, if device reinitialization
fails, both supplies remain enabled. The runtime PM core keeps the
device suspended when its resume callback fails, so the supplies must
be restored to the suspended state.

Disable the supplies enabled by the callback before returning an error.

Fixes: 97d642e23037 ("iio: light: Add a driver for Sharp GP2AP002x00F")
Assisted-by: Codex:gpt-5
Signed-off-by: Laxman Acharya Padhya <acharyalaxman8848@gmail.com>
---
 drivers/iio/light/gp2ap002.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/light/gp2ap002.c b/drivers/iio/light/gp2ap002.c
index c83f67f..efef332 100644
--- a/drivers/iio/light/gp2ap002.c
+++ b/drivers/iio/light/gp2ap002.c
@@ -669,7 +669,7 @@ static int gp2ap002_runtime_resume(struct device *dev)
 	ret = regulator_enable(gp2ap002->vio);
 	if (ret) {
 		dev_err(dev, "failed to enable VIO regulator in resume path\n");
-		return ret;
+		goto out_disable_vdd;
 	}
 
 	msleep(20);
@@ -677,13 +677,19 @@ static int gp2ap002_runtime_resume(struct device *dev)
 	ret = gp2ap002_init(gp2ap002);
 	if (ret) {
 		dev_err(dev, "re-initialization failed\n");
-		return ret;
+		goto out_disable_vio;
 	}
 
 	/* Re-activate the IRQ */
 	enable_irq(gp2ap002->irq);
 
 	return 0;
+
+out_disable_vio:
+	regulator_disable(gp2ap002->vio);
+out_disable_vdd:
+	regulator_disable(gp2ap002->vdd);
+	return ret;
 }
 
 static DEFINE_RUNTIME_DEV_PM_OPS(gp2ap002_dev_pm_ops, gp2ap002_runtime_suspend,
-- 
2.51.2

Re: [PATCH] iio: light: gp2ap002: Disable regulators on resume failure

[Andy Shevchenko]

On Sat, Jul 04, 2026 at 02:19:12PM +0545, Laxman Acharya Padhya wrote:
> If enabling VIO fails after VDD has been enabled, runtime resume
> returns without disabling VDD. Likewise, if device reinitialization
> fails, both supplies remain enabled. The runtime PM core keeps the
> device suspended when its resume callback fails, so the supplies must
> be restored to the suspended state.
> 
> Disable the supplies enabled by the callback before returning an error.

Sounds legit. However, I can't be fully sure. Let's wait for others to look at
this and comment.

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH] iio: light: gp2ap002: Disable regulators on resume failure

[Linus Walleij]

On Sat, Jul 4, 2026 at 10:34 AM Laxman Acharya Padhya
<acharyalaxman8848@gmail.com> wrote:

> If enabling VIO fails after VDD has been enabled, runtime resume
> returns without disabling VDD. Likewise, if device reinitialization
> fails, both supplies remain enabled. The runtime PM core keeps the
> device suspended when its resume callback fails, so the supplies must
> be restored to the suspended state.
>
> Disable the supplies enabled by the callback before returning an error.
>
> Fixes: 97d642e23037 ("iio: light: Add a driver for Sharp GP2AP002x00F")
> Assisted-by: Codex:gpt-5
> Signed-off-by: Laxman Acharya Padhya <acharyalaxman8848@gmail.com>

Looks right.
Reviewed-by: Linus Walleij <linusw@kernel.org>

Yours,
Linus Walleij

Re: [PATCH] iio: light: gp2ap002: Disable regulators on resume failure

[Jonathan Cameron]

On Fri, 10 Jul 2026 19:40:50 +0200
Linus Walleij <linusw@kernel.org> wrote:

> On Sat, Jul 4, 2026 at 10:34 AM Laxman Acharya Padhya
> <acharyalaxman8848@gmail.com> wrote:
> 
> > If enabling VIO fails after VDD has been enabled, runtime resume
> > returns without disabling VDD. Likewise, if device reinitialization
> > fails, both supplies remain enabled. The runtime PM core keeps the
> > device suspended when its resume callback fails, so the supplies must
> > be restored to the suspended state.
> >
> > Disable the supplies enabled by the callback before returning an error.
> >
> > Fixes: 97d642e23037 ("iio: light: Add a driver for Sharp GP2AP002x00F")
> > Assisted-by: Codex:gpt-5
> > Signed-off-by: Laxman Acharya Padhya <acharyalaxman8848@gmail.com>  
> 
> Looks right.
> Reviewed-by: Linus Walleij <linusw@kernel.org>
Applied, and marked for stable.

Jonathan

> 
> Yours,
> Linus Walleij