diff mbox series

[-next] ASoC: mt6660: Keep the pm_runtime enables before component stuff in mt6660_i2c_probe

Message ID 20221008140522.134912-1-zhangqilong3@huawei.com (mailing list archive)
State Accepted
Commit c4ab29b0f3a6f1e167c5a627f7cd036c1d2b7d65
Headers show
Series [-next] ASoC: mt6660: Keep the pm_runtime enables before component stuff in mt6660_i2c_probe | expand

Commit Message

Zhang Qilong Oct. 8, 2022, 2:05 p.m. UTC 
It would be better to keep the pm_runtime enables before the
IRQ and component stuff. Both of those could start triggering
PM runtime events.

Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
---
 sound/soc/codecs/mt6660.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Mark Brown Oct. 13, 2022, 1:41 p.m. UTC | #1 
On Sat, 8 Oct 2022 22:05:22 +0800, Zhang Qilong wrote:
> It would be better to keep the pm_runtime enables before the
> IRQ and component stuff. Both of those could start triggering
> PM runtime events.
> 
> 

Applied to

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

Thanks!

[1/1] ASoC: mt6660: Keep the pm_runtime enables before component stuff in mt6660_i2c_probe
      commit: c4ab29b0f3a6f1e167c5a627f7cd036c1d2b7d65

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
diff mbox series

Patch

diff --git a/sound/soc/codecs/mt6660.c b/sound/soc/codecs/mt6660.c
index 554c33e8b62f..cc2df5f7ea19 100644
--- a/sound/soc/codecs/mt6660.c
+++ b/sound/soc/codecs/mt6660.c
@@ -503,14 +503,14 @@  static int mt6660_i2c_probe(struct i2c_client *client)
 		dev_err(chip->dev, "read chip revision fail\n");
 		goto probe_fail;
 	}
+	pm_runtime_set_active(chip->dev);
+	pm_runtime_enable(chip->dev);
 
 	ret = devm_snd_soc_register_component(chip->dev,
 					       &mt6660_component_driver,
 					       &mt6660_codec_dai, 1);
-	if (!ret) {
-		pm_runtime_set_active(chip->dev);
-		pm_runtime_enable(chip->dev);
-	}
+	if (ret)
+		pm_runtime_disable(chip->dev);
 
 	return ret;