Skip to contentSkip to conversation

ASoC: cs35l56: Don't leave parent IRQ disabled if system_suspend fails

PATCH In review Richard Fitzgerald 2 participants 3 messages Jun 10 – Jun 11

Subsystems (3)
lore
Share & tools
lore

Richard Fitzgerald

author maintainer
#0 lore raw

PATCH 1/1 ASoC: cs35l56: Don't leave parent IRQ disabled if system_suspend fails

In cs35l56_system_suspend() re-enable the parent IRQ if the call to pm_runtime_force_suspend() returns an error.

Fixes f9dc6b875ec0 ("ASoC: cs35l56: Add basic system suspend handling")
---
 sound/soc/codecs/cs35l56.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
sound/soc/codecs/cs35l56.c +6 -1
index 2e3b5f5e33ba..570a68829ccd 100644
@@ -1524,6 +1524,7 @@ static int __maybe_unused cs35l56_runtime_resume_i2c_spi(struct device *dev)
 int cs35l56_system_suspend(struct device *dev)
 {
 	struct cs35l56_private *cs35l56 = dev_get_drvdata(dev);
+	int ret;
 
 	dev_dbg(dev, "system_suspend\n");
 
@@ -1539,7 +1540,11 @@ int cs35l56_system_suspend(struct device *dev)
 	if (cs35l56->base.irq)
 		disable_irq(cs35l56->base.irq);
 
-	return pm_runtime_force_suspend(dev);
+	ret = pm_runtime_force_suspend(dev);
+	if ((ret < 0) && cs35l56->base.irq)
+		enable_irq(cs35l56->base.irq);
+
+	return ret;
 }
 EXPORT_SYMBOL_GPL(cs35l56_system_suspend);
 
Signature · 1 line
2.47.3
author maintainer
#1 lore raw
Quoted 6 lines · Richard Fitzgerald

In cs35l56_system_suspend() re-enable the parent IRQ if the call to pm_runtime_force_suspend() returns an error.

Fixes f9dc6b875ec0 ("ASoC: cs35l56: Add basic system suspend handling")

---

Forgot to add this note to the commit message:

This is for-next.

It's not critical and can be left to trickle down into backports from 7.2.

maintainer
#2 lore raw
In reply to Richard Fitzgerald
Quoted 1 line · Richard Fitzgerald

ASoC: cs35l56: Don't leave parent IRQ disabled if system_suspend fails

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.2

Thanks!

[1/1] ASoC: cs35l56: Don't leave parent IRQ disabled if system_suspend fails

      https://git.kernel.org/broonie/sound/c/53cebeb01716

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