2021-04-14 18:15:46

by Hsin-Yi Wang

Subject: [PATCH v19 4/6] misc: eeprom: at24: check suspend status before disable regulator

cd5676db0574 ("misc: eeprom: at24: support pm_runtime control") disables
regulator in runtime suspend. If runtime suspend is called before
regulator disable, it will results in regulator unbalanced disabling.

Signed-off-by: Hsin-Yi Wang <[email protected]>
---
drivers/misc/eeprom/at24.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 926408b41270..7a6f01ace78a 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -763,7 +763,8 @@ static int at24_probe(struct i2c_client *client)
at24->nvmem = devm_nvmem_register(dev, &nvmem_config);
if (IS_ERR(at24->nvmem)) {
pm_runtime_disable(dev);
- regulator_disable(at24->vcc_reg);
+ if (!pm_runtime_status_suspended(dev))
+ regulator_disable(at24->vcc_reg);
return PTR_ERR(at24->nvmem);
}

@@ -774,7 +775,8 @@ static int at24_probe(struct i2c_client *client)
err = at24_read(at24, 0, &test_byte, 1);
if (err) {
pm_runtime_disable(dev);
- regulator_disable(at24->vcc_reg);
+ if (!pm_runtime_status_suspended(dev))
+ regulator_disable(at24->vcc_reg);
return -ENODEV;
}

--
2.31.1.295.g9ea45b61b8-goog

2021-04-16 14:28:13

by Bartosz Golaszewski

Subject: Re: [PATCH v19 4/6] misc: eeprom: at24: check suspend status before disable regulator

On Wed, Apr 14, 2021 at 7:29 PM Hsin-Yi Wang <[email protected]> wrote:
>
> cd5676db0574 ("misc: eeprom: at24: support pm_runtime control") disables
> regulator in runtime suspend. If runtime suspend is called before
> regulator disable, it will results in regulator unbalanced disabling.
>
> Signed-off-by: Hsin-Yi Wang <[email protected]>

Please add the Fixes tag.

> ---
> drivers/misc/eeprom/at24.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
> index 926408b41270..7a6f01ace78a 100644
> --- a/drivers/misc/eeprom/at24.c
> +++ b/drivers/misc/eeprom/at24.c
> @@ -763,7 +763,8 @@ static int at24_probe(struct i2c_client *client)
> at24->nvmem = devm_nvmem_register(dev, &nvmem_config);
> if (IS_ERR(at24->nvmem)) {
> pm_runtime_disable(dev);
> - regulator_disable(at24->vcc_reg);
> + if (!pm_runtime_status_suspended(dev))
> + regulator_disable(at24->vcc_reg);
> return PTR_ERR(at24->nvmem);
> }
>
> @@ -774,7 +775,8 @@ static int at24_probe(struct i2c_client *client)
> err = at24_read(at24, 0, &test_byte, 1);
> if (err) {
> pm_runtime_disable(dev);
> - regulator_disable(at24->vcc_reg);
> + if (!pm_runtime_status_suspended(dev))
> + regulator_disable(at24->vcc_reg);
> return -ENODEV;
> }
>
> --
> 2.31.1.295.g9ea45b61b8-goog
>

Acked-by: Bartosz Golaszewski <[email protected]>

2021-04-20 13:36:02

by Hsin-Yi Wang

Subject: Re: [PATCH v19 4/6] misc: eeprom: at24: check suspend status before disable regulator

On Fri, Apr 16, 2021 at 10:09 PM Bartosz Golaszewski
<[email protected]> wrote:
>
> On Wed, Apr 14, 2021 at 7:29 PM Hsin-Yi Wang <[email protected]> wrote:
> >
> > cd5676db0574 ("misc: eeprom: at24: support pm_runtime control") disables
> > regulator in runtime suspend. If runtime suspend is called before
> > regulator disable, it will results in regulator unbalanced disabling.
> >
> > Signed-off-by: Hsin-Yi Wang <[email protected]>
>
> Please add the Fixes tag.
>

Hi,

I resend the patch with the fix tag separately since other patches in
this series are not changed.

https://patchwork.ozlabs.org/project/linux-i2c/patch/[email protected]/

Thanks

> > ---
> > drivers/misc/eeprom/at24.c | 6 ++++--
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
> > index 926408b41270..7a6f01ace78a 100644
> > --- a/drivers/misc/eeprom/at24.c
> > +++ b/drivers/misc/eeprom/at24.c
> > @@ -763,7 +763,8 @@ static int at24_probe(struct i2c_client *client)
> > at24->nvmem = devm_nvmem_register(dev, &nvmem_config);
> > if (IS_ERR(at24->nvmem)) {
> > pm_runtime_disable(dev);
> > - regulator_disable(at24->vcc_reg);
> > + if (!pm_runtime_status_suspended(dev))
> > + regulator_disable(at24->vcc_reg);
> > return PTR_ERR(at24->nvmem);
> > }
> >
> > @@ -774,7 +775,8 @@ static int at24_probe(struct i2c_client *client)
> > err = at24_read(at24, 0, &test_byte, 1);
> > if (err) {
> > pm_runtime_disable(dev);
> > - regulator_disable(at24->vcc_reg);
> > + if (!pm_runtime_status_suspended(dev))
> > + regulator_disable(at24->vcc_reg);
> > return -ENODEV;
> > }
> >
> > --
> > 2.31.1.295.g9ea45b61b8-goog
> >
>
> Acked-by: Bartosz Golaszewski <[email protected]>