pinctrl: aw9523: add missing mutex_destroy
Subsystems (2)
PATCH 1/2 pinctrl: aw9523: add missing mutex_destroy
Otherwise the mutex remains after a failed kzalloc.
Signed-off-by Rosen Penev <[email protected]>
--- drivers/pinctrl/pinctrl-aw9523.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/pinctrl/pinctrl-aw9523.c +4 -2
@@ -987,8 +987,10 @@ static int aw9523_probe(struct i2c_client *client)lockdep_set_subclass (&awi->i2c_lock,i2c_adapter_depth (client->adapter)); pdesc =devm_kzalloc (dev,sizeof (*pdesc),GFP_KERNEL ); -if (!pdesc) -return -ENOMEM ; +if (!pdesc) { + ret = -ENOMEM ; + goto err_disable_vregs; + } ret =aw9523_hw_init (awi);if (ret)
Signature · 1 line
2.46.2
PATCH 2/2 pinctrl: aw9523: use enable for regulator
devm_regulator_get_enable_optional can be used to simplify the logic here.
Signed-off-by Rosen Penev <[email protected]>
--- drivers/pinctrl/pinctrl-aw9523.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-)
drivers/pinctrl/pinctrl-aw9523.c +5 -16
@@ -80,7 +80,7 @@ struct aw9523 {struct regmap *regmap;struct mutex i2c_lock;struct gpio_desc *reset_gpio; -struct regulator *vio_vreg; +int vio_vreg;struct pinctrl_dev *pctl;struct gpio_chip gpio;struct aw9523_irq *irq;
@@ -972,16 +972,9 @@ static int aw9523_probe(struct i2c_client *client)if (IS_ERR (awi->regmap))return PTR_ERR (awi->regmap); - awi->vio_vreg =devm_regulator_get_optional (dev,"vio" ); -if (IS_ERR (awi->vio_vreg)) { -if (PTR_ERR (awi->vio_vreg) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; - awi->vio_vreg =NULL ; - }else { - ret =regulator_enable (awi->vio_vreg); -if (ret) -return ret; - } + awi->vio_vreg =devm_regulator_get_enable_optional (dev,"vio" ); +if (awi->vio_vreg && awi->vio_vreg != -ENODEV ) +return awi->vio_vreg;mutex_init (&awi->i2c_lock);lockdep_set_subclass (&awi->i2c_lock,i2c_adapter_depth (client->adapter));
@@ -1027,8 +1020,6 @@ static int aw9523_probe(struct i2c_client *client)return ret; err_disable_vregs: -if (awi->vio_vreg) -regulator_disable (awi->vio_vreg);mutex_destroy (&awi->i2c_lock);return ret; }
@@ -1043,9 +1034,7 @@ static void aw9523_remove(struct i2c_client *client)* set the pins to hardware defaults before removing the driver * to leave it in a clean, safe and predictable state. */ -if (awi->vio_vreg) { -regulator_disable (awi->vio_vreg); - }else { +if (awi->vio_vreg == -ENODEV ) {mutex_lock (&awi->i2c_lock);aw9523_hw_init (awi);mutex_unlock (&awi->i2c_lock);
Signature · 1 line
2.46.2
Re: [PATCH 2/2] pinctrl: aw9523: use enable for regulator
Quoted 4 lines · Rosen Penev
devm_regulator_get_enable_optionalcan be used to simplify the logic here.Signed-off-by Rosen Penev <[email protected]>
Patch applied for v6.13!
Thanks!
Linus Walleij
Quoted 3 lines · Rosen Penev
Otherwise the mutex remains after a failed kzalloc.
Signed-off-by Rosen Penev <[email protected]>
Patch applied for fixes!
Yours,
Linus Walleij