[v2,1/3] ASoC: codecs: wcd937x-sdw: Fix Unbalanced pm_runtime_enable

Commit Message

Mohammad Rafi Shaik July 4, 2024, 8:17 a.m. UTC

Fix the unbalanced pm_runtime_enable! in wcd937x-sdw soundwire slave.

Fixes: c99a515ff153 ("ASoC: codecs: wcd937x-sdw: add SoundWire driver")
Signed-off-by: Mohammad Rafi Shaik <[e-mail]>
---
 sound/soc/codecs/wcd937x-sdw.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

Patch

diff --git a/sound/soc/codecs/wcd937x-sdw.c b/sound/soc/codecs/wcd937x-sdw.c
index a24d6c620dba..3abc8041406a 100644
--- a/sound/soc/codecs/wcd937x-sdw.c
+++ b/sound/soc/codecs/wcd937x-sdw.c
@@ -1067,13 +1067,15 @@  static int wcd9370_probe(struct sdw_slave *pdev,
 		wcd->ch_info = &wcd937x_sdw_rx_ch_info[0];
 	}
 
-	pm_runtime_set_autosuspend_delay(dev, 3000);
-	pm_runtime_use_autosuspend(dev);
-	pm_runtime_mark_last_busy(dev);
-	pm_runtime_set_active(dev);
-	pm_runtime_enable(dev);
 
-	return component_add(dev, &wcd937x_sdw_component_ops);
+	ret = component_add(dev, &wcd937x_sdw_component_ops);
+	if (ret)
+		return ret;
+
+	/* Set suspended until aggregate device is bind */
+	pm_runtime_set_suspended(dev);
+
+	return 0;
 }
 
 static int wcd9370_remove(struct sdw_slave *pdev)
@@ -1082,10 +1084,6 @@  static int wcd9370_remove(struct sdw_slave *pdev)
 
 	component_del(dev, &wcd937x_sdw_component_ops);
 
-	pm_runtime_disable(dev);
-	pm_runtime_set_suspended(dev);
-	pm_runtime_dont_use_autosuspend(dev);
-
 	return 0;
 }