Re: [alsa-devel] [PATCH] ASoC: wm2200: add missed operations in remove and probe failure

[Charles Keepax <ckeepax@opensource.cirrus.com>]

On Mon, Nov 18, 2019 at 03:36:33PM +0800, Chuhong Yuan wrote:
> This driver misses calls to pm_runtime_disable and regulator_bulk_disable
> in remove and a call to free_irq in probe failure.
> Add the calls to fix it.
> 
> Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
> ---
>  sound/soc/codecs/wm2200.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c
> index cf64e109c658..7b087d94141b 100644
> --- a/sound/soc/codecs/wm2200.c
> +++ b/sound/soc/codecs/wm2200.c
> @@ -2410,6 +2410,8 @@ static int wm2200_i2c_probe(struct i2c_client *i2c,
>  
>  err_pm_runtime:
>  	pm_runtime_disable(&i2c->dev);
> +	if (i2c->irq)
> +		free_irq(i2c->irq, wm2200);

Might be worth also adding a return if the request of the IRQ
fails. We will get a large WARN in the log if the IRQ request
failed, then we fall down this error path.

>  err_reset:
>  	if (wm2200->pdata.reset)
>  		gpio_set_value_cansleep(wm2200->pdata.reset, 0);
> @@ -2426,12 +2428,15 @@ static int wm2200_i2c_remove(struct i2c_client *i2c)
>  {
>  	struct wm2200_priv *wm2200 = i2c_get_clientdata(i2c);
>  
> +	pm_runtime_disable(&i2c->dev);
>  	if (i2c->irq)
>  		free_irq(i2c->irq, wm2200);
>  	if (wm2200->pdata.reset)
>  		gpio_set_value_cansleep(wm2200->pdata.reset, 0);
>  	if (wm2200->pdata.ldo_ena)
>  		gpio_set_value_cansleep(wm2200->pdata.ldo_ena, 0);
> +	regulator_bulk_disable(ARRAY_SIZE(wm2200->core_supplies),
> +			       wm2200->core_supplies);

This one is a bit trickier since this regulator is being
controlled by PM runtime, and I don't think it necessarily leaves
things in an enabled state when it is disabled.

Thanks,
Charles
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel