[PATCH v2 2/9] ASoC: nau8824: restore safe state after resume errors

[Pengpeng Hou]

nau8824_resume() ignores regcache_sync() failure before continuing
dependent resume operations. Restore cache-only mode, leave the cache
dirty, and return the replay error before those operations.

Do not acquire the jack-detection semaphore or enable its IRQ after a
failed replay.

ASoC still marks the component resumed when the callback reports failure.
Track the suspend-owned IRQ disable so another suspend does not increment
the disable depth again after a failed resume. A later successful resume
releases that one disable reference. This does not add automatic retry or
change the framework's best-effort card resume policy.

The issue was found by our static-analysis tool and manually reviewed.

Fixes: dfeabded0496 ("ASoC: nau8824: new driver")
Assisted-by: gpt 5
Signed-off-by: Pengpeng Hou <hppiscas@xxxxxxx>
---
Changes since v1:
- restore cache-only mode and dirty state on replay failure
- keep suspend-owned IRQ disables balanced across failed resume cycles
- send as one correctly threaded series, as Mark requested

Previous series:
https://lore.kernel.org/all/20260906034321.86080-1-hppiscas@xxxxxxx/

 sound/soc/codecs/nau8824.c |   17 ++++++++++++++---
 sound/soc/codecs/nau8824.h |    1 +
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/sound/soc/codecs/nau8824.c b/sound/soc/codecs/nau8824.c
index 853eb9472af92df981b4668c6b0d0dd573c6c30c..522f8951b0598da3bf1def9119ec27a086427fde 100644
--- a/sound/soc/codecs/nau8824.c
+++ b/sound/soc/codecs/nau8824.c
@@ -1531,7 +1531,10 @@ static int __maybe_unused nau8824_suspend(struct snd_soc_component *component)
 	struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component);
 
 	if (nau8824->irq) {
-		disable_irq(nau8824->irq);
+		if (!nau8824->suspend_irq_disabled) {
+			disable_irq(nau8824->irq);
+			nau8824->suspend_irq_disabled = true;
+		}
 		snd_soc_dapm_force_bias_level(nau8824->dapm, SND_SOC_BIAS_OFF);
 	}
 	regcache_cache_only(nau8824->regmap, true);
@@ -1546,7 +1549,12 @@ static int __maybe_unused nau8824_resume(struct snd_soc_component *component)
 	int ret;
 
 	regcache_cache_only(nau8824->regmap, false);
-	regcache_sync(nau8824->regmap);
+	ret = regcache_sync(nau8824->regmap);
+	if (ret) {
+		regcache_cache_only(nau8824->regmap, true);
+		regcache_mark_dirty(nau8824->regmap);
+		return ret;
+	}
 	if (nau8824->irq) {
 		/* Hold semaphore to postpone playback happening
 		 * until jack detection done.
@@ -1555,7 +1563,10 @@ static int __maybe_unused nau8824_resume(struct snd_soc_component *component)
 		ret = nau8824_sema_acquire(nau8824, 0);
 		if (ret)
 			nau8824->resume_lock = false;
-		enable_irq(nau8824->irq);
+		if (nau8824->suspend_irq_disabled) {
+			nau8824->suspend_irq_disabled = false;
+			enable_irq(nau8824->irq);
+		}
 	}
 
 	return 0;
diff --git a/sound/soc/codecs/nau8824.h b/sound/soc/codecs/nau8824.h
index d8e19515133c803c20dfcb167f073515daa6f39a..f44fc39836d634e8f0b98ac9292dabe8069612b2 100644
--- a/sound/soc/codecs/nau8824.h
+++ b/sound/soc/codecs/nau8824.h
@@ -437,6 +437,7 @@ struct nau8824 {
 	struct clk *mclk;
 	int fs;
 	int irq;
+	bool suspend_irq_disabled;
 	int resume_lock;
 	int micbias_voltage;
 	int vref_impedance;

base-commit: 8ef28aef33f2d5da6959ad6b579ec3cfccc009f6