* [alsa-devel] [PATCH] ASoC: wm2200: add missed operations in remove and probe failure
@ 2019-11-18 7:36 Chuhong Yuan
2019-11-18 11:57 ` Charles Keepax
2019-11-18 13:00 ` [alsa-devel] Applied "ASoC: wm2200: add missed operations in remove and probe failure" to the asoc tree Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Chuhong Yuan @ 2019-11-18 7:36 UTC (permalink / raw)
Cc: alsa-devel, patches, Chuhong Yuan, Takashi Iwai, Liam Girdwood,
Mark Brown, linux-kernel
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);
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;
}
--
2.24.0
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [alsa-devel] [PATCH] ASoC: wm2200: add missed operations in remove and probe failure
2019-11-18 7:36 [alsa-devel] [PATCH] ASoC: wm2200: add missed operations in remove and probe failure Chuhong Yuan
@ 2019-11-18 11:57 ` Charles Keepax
2019-11-18 13:00 ` [alsa-devel] Applied "ASoC: wm2200: add missed operations in remove and probe failure" to the asoc tree Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Charles Keepax @ 2019-11-18 11:57 UTC (permalink / raw)
To: Chuhong Yuan
Cc: alsa-devel, patches, Takashi Iwai, Liam Girdwood, Mark Brown,
linux-kernel
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
^ permalink raw reply [flat|nested] 3+ messages in thread* [alsa-devel] Applied "ASoC: wm2200: add missed operations in remove and probe failure" to the asoc tree
2019-11-18 7:36 [alsa-devel] [PATCH] ASoC: wm2200: add missed operations in remove and probe failure Chuhong Yuan
2019-11-18 11:57 ` Charles Keepax
@ 2019-11-18 13:00 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2019-11-18 13:00 UTC (permalink / raw)
To: Chuhong Yuan
Cc: alsa-devel, patches, Takashi Iwai, Liam Girdwood, linux-kernel,
Mark Brown, Cc:
The patch
ASoC: wm2200: add missed operations in remove and probe failure
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.5
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
From 51af759a930c18d2ee450772e01c614564772b2a Mon Sep 17 00:00:00 2001
From: Chuhong Yuan <hslester96@gmail.com>
Date: Mon, 18 Nov 2019 15:36:33 +0800
Subject: [PATCH] ASoC: wm2200: add missed operations in remove and probe
failure
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 +++++
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);
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;
}
--
2.20.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-11-18 13:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-18 7:36 [alsa-devel] [PATCH] ASoC: wm2200: add missed operations in remove and probe failure Chuhong Yuan
2019-11-18 11:57 ` Charles Keepax
2019-11-18 13:00 ` [alsa-devel] Applied "ASoC: wm2200: add missed operations in remove and probe failure" to the asoc tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).