Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1dd5897 authored by Viresh Kumar's avatar Viresh Kumar Committed by Mark Brown
Browse files

ASoC: core: Don't overwrite .poweroff in snd_soc_pm_ops 



SET_SYSTEM_SLEEP_PM_OPS writes .poweroff = *_resume once. Then we overwrite it
again explicitly as .poweroff = snd_soc_poweroff. Even though it works, as the
second one overwrites the first one, this is not the correct way. Fix this by
expanding SET_SYSTEM_SLEEP_PM_OPS in our structure.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 0512615d

sound/soc/soc-core.c

+5 −1
Original line number Diff line number Diff line
@@ -1718,8 +1718,12 @@ int snd_soc_poweroff(struct device *dev) 
EXPORT_SYMBOL_GPL(snd_soc_poweroff);



const struct dev_pm_ops snd_soc_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(snd_soc_suspend, snd_soc_resume)

	.suspend = snd_soc_suspend,

	.resume = snd_soc_resume,

	.freeze = snd_soc_suspend,

	.thaw = snd_soc_resume,

	.poweroff = snd_soc_poweroff,

	.restore = snd_soc_resume,

};

EXPORT_SYMBOL_GPL(snd_soc_pm_ops);