diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-12-06 17:25:10 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-12-06 17:25:10 +0100 |
| commit | 38ddfb2699d524b85929aa7da93bfc3a7f2c9275 (patch) | |
| tree | 8c03696cd79f4a0c7f7e494dbf2be6313e248c7a /sound/soc/tegra/tegra210_sfc.c | |
| parent | fb1af5bea4670c835e42fc0c14c49d3499468774 (diff) | |
| parent | 3fc27e9a1f619b50700f020e6cd270c1b74755f0 (diff) | |
Merge tag 'asoc-fix-v5.16-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.16
A relatively large collection of updates, the size is increased quite a
bit by there being some repetitive changes for similar issues that occur
multiple times with both notifying control value changes and runtime PM.
The Rockchip update looks at first glance like a cleanup but fixes
instantiation of the hardware on some systems.
Diffstat (limited to 'sound/soc/tegra/tegra210_sfc.c')
| -rw-r--r-- | sound/soc/tegra/tegra210_sfc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/tegra/tegra210_sfc.c b/sound/soc/tegra/tegra210_sfc.c index 7a2227ed3df6..368f077e7bee 100644 --- a/sound/soc/tegra/tegra210_sfc.c +++ b/sound/soc/tegra/tegra210_sfc.c @@ -3594,8 +3594,8 @@ static int tegra210_sfc_platform_remove(struct platform_device *pdev) static const struct dev_pm_ops tegra210_sfc_pm_ops = { SET_RUNTIME_PM_OPS(tegra210_sfc_runtime_suspend, tegra210_sfc_runtime_resume, NULL) - SET_LATE_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, - pm_runtime_force_resume) + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) }; static struct platform_driver tegra210_sfc_driver = { |