ASoC: wm2200: add missed operations in remove and probe failure (2dab09be) · Commits · 戴 / test

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> Link: https://lore.kernel.org/r/20191118073633.28237-1-hslester96@gmail.com Signed-off-by:

Mark Brown <broonie@kernel.org>

sound/soc/codecs/wm2200.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -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);
		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);

		return 0;
		}

Admin message