summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-04-05 19:35:30 -0600
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-06 23:13:48 +0900
commitdeb2607e6c3d75c7185bb8aba658d9cd57e6e54a (patch)
treeffd08964a97f25ad10c3b78b9069e1cc9b1b870f /sound
parent00b317a41c5428b13eb7e5b4bbc691b1aa7afa80 (diff)
downloadlinux-3.10-deb2607e6c3d75c7185bb8aba658d9cd57e6e54a.tar.gz
linux-3.10-deb2607e6c3d75c7185bb8aba658d9cd57e6e54a.tar.bz2
linux-3.10-deb2607e6c3d75c7185bb8aba658d9cd57e6e54a.zip
ASoC: Tegra: Suspend/resume support
ASoC machine drivers that are their own platform_driver (as opposed to those using the soc-audio platform_driver) need to explicitly set up power-management operation callbacks. To avoid cut/paste, snd_soc_pm_ops also needs to be exported. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-core.c1
-rw-r--r--sound/soc/tegra/harmony.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b76b74db096..960718b3beb 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2060,6 +2060,7 @@ const struct dev_pm_ops snd_soc_pm_ops = {
.resume = snd_soc_resume,
.poweroff = snd_soc_poweroff,
};
+EXPORT_SYMBOL_GPL(snd_soc_pm_ops);
/* ASoC platform driver */
static struct platform_driver soc_driver = {
diff --git a/sound/soc/tegra/harmony.c b/sound/soc/tegra/harmony.c
index 8585957477e..556a5713392 100644
--- a/sound/soc/tegra/harmony.c
+++ b/sound/soc/tegra/harmony.c
@@ -370,6 +370,7 @@ static struct platform_driver tegra_snd_harmony_driver = {
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
+ .pm = &snd_soc_pm_ops,
},
.probe = tegra_snd_harmony_probe,
.remove = __devexit_p(tegra_snd_harmony_remove),