[PATCH] ASoC: rt5665: add missed regulator_bulk_disable

Zhang Shurong posted 1 patch 2 years, 6 months ago
There is a newer version of this series
sound/soc/codecs/rt5665.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
[PATCH] ASoC: rt5665: add missed regulator_bulk_disable
Posted by Zhang Shurong 2 years, 6 months ago
The driver forgets to call regulator_bulk_disable()

Add the missed call to fix it.

Fixes: 33ada14a26c8 ("ASoC: add rt5665 codec driver")
Signed-off-by: Zhang Shurong <zhang_shurong@foxmail.com>
---
 sound/soc/codecs/rt5665.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/sound/soc/codecs/rt5665.c b/sound/soc/codecs/rt5665.c
index 83c367af91da..de36cad8a559 100644
--- a/sound/soc/codecs/rt5665.c
+++ b/sound/soc/codecs/rt5665.c
@@ -4756,6 +4756,13 @@ static void rt5665_calibrate_handler(struct work_struct *work)
 	rt5665_calibrate(rt5665);
 }
 
+static void rt5665_i2c_disable_regulators(void *data)
+{
+	struct rt5665_priv *rt5665 = data;
+
+	regulator_bulk_disable(ARRAY_SIZE(rt5665->supplies), rt5665->supplies);
+}
+
 static int rt5665_i2c_probe(struct i2c_client *i2c)
 {
 	struct rt5665_platform_data *pdata = dev_get_platdata(&i2c->dev);
@@ -4786,6 +4793,11 @@ static int rt5665_i2c_probe(struct i2c_client *i2c)
 		return ret;
 	}
 
+	ret = devm_add_action_or_reset(&i2c->dev, rt5665_i2c_disable_regulators,
+			rt5665);
+	if (ret)
+		return ret;
+
 	ret = regulator_bulk_enable(ARRAY_SIZE(rt5665->supplies),
 				    rt5665->supplies);
 	if (ret != 0) {
-- 
2.41.0
Re: [PATCH] ASoC: rt5665: add missed regulator_bulk_disable
Posted by Mark Brown 2 years, 6 months ago
On Sun, Jul 23, 2023 at 03:07:31PM +0800, Zhang Shurong wrote:

> +	ret = devm_add_action_or_reset(&i2c->dev, rt5665_i2c_disable_regulators,
> +			rt5665);
> +	if (ret)
> +		return ret;
> +
>  	ret = regulator_bulk_enable(ARRAY_SIZE(rt5665->supplies),
>  				    rt5665->supplies);
>  	if (ret != 0) {

This will attempt to disable the regulators if the initial enable fails
which is a bug.
Re: [PATCH] ASoC: rt5665: add missed regulator_bulk_disable
Posted by Zhang Shurong 2 years, 6 months ago
在 2023年7月23日星期日 CST 下午11:12:17,Mark Brown 写道:
> On Sun, Jul 23, 2023 at 03:07:31PM +0800, Zhang Shurong wrote:
> > +	ret = devm_add_action_or_reset(&i2c->dev, 
rt5665_i2c_disable_regulators,
> > +			rt5665);
> > +	if (ret)
> > +		return ret;
> > +
> > 
> >  	ret = regulator_bulk_enable(ARRAY_SIZE(rt5665->supplies),
> >  	
> >  				    rt5665->supplies);
> >  	
> >  	if (ret != 0) {
> 
> This will attempt to disable the regulators if the initial enable fails
> which is a bug.
You are right. I will move this to rt5663_i2c_remove() in next version.