aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-11-14 14:32:40 -0800
committerColin Cross <ccross@android.com>2011-11-14 14:32:40 -0800
commitc2d6cadd8bbe9221ca8c9f0d3039326b0f2b336a (patch)
tree92087ade8e0968fd4eba07773ca4bac21de40588 /sound/soc
parent186995652737d68b381c88959b506c6cacaf08b1 (diff)
parent9f669fc19d10d21085d45af47fa0256923668b95 (diff)
downloadkernel_samsung_tuna-c2d6cadd8bbe9221ca8c9f0d3039326b0f2b336a.zip
kernel_samsung_tuna-c2d6cadd8bbe9221ca8c9f0d3039326b0f2b336a.tar.gz
kernel_samsung_tuna-c2d6cadd8bbe9221ca8c9f0d3039326b0f2b336a.tar.bz2
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-core.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 3567fb0..bfbaf5f 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2306,6 +2306,11 @@ int snd_soc_poweroff(struct device *dev)
}
EXPORT_SYMBOL_GPL(snd_soc_poweroff);
+void soc_shutdown(struct platform_device *pdev)
+{
+ snd_soc_poweroff(&pdev->dev);
+}
+
const struct dev_pm_ops snd_soc_pm_ops = {
.suspend = snd_soc_suspend,
.resume = snd_soc_resume,
@@ -2322,6 +2327,7 @@ static struct platform_driver soc_driver = {
},
.probe = soc_probe,
.remove = soc_remove,
+ .shutdown = soc_shutdown,
};
/* create a new pcm */