summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorMark Brown2009-06-22 14:16:51 +0200
committerMark Brown2009-06-24 00:48:53 +0200
commit517374704da44c1ba77c1600714fe214524af286 (patch)
tree878a914bb5bd383e5f883bffc2e5cbf884366a6e /sound/soc/soc-core.c
parentASoC: TWL4030: Correct bypass event for voice sidetone (diff)
downloadkernel-qcow2-linux-517374704da44c1ba77c1600714fe214524af286.tar.gz
kernel-qcow2-linux-517374704da44c1ba77c1600714fe214524af286.tar.xz
kernel-qcow2-linux-517374704da44c1ba77c1600714fe214524af286.zip
ASoC: Add a shutdown callback
Ensure that the audio subsystem is powered down cleanly when the system shuts down by providing a shutdown operation. This ensures that all the components have been returned to an off state cleanly which should avoid audio issues from partially charged capacitors or noise on digital inputs if the system is restarted quickly. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Tested-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 44141178ff4a..55d45c43ba16 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1020,6 +1020,21 @@ static int soc_remove(struct platform_device *pdev)
return 0;
}
+static void soc_shutdown(struct platform_device *pdev)
+{
+ struct snd_soc_device *socdev = platform_get_drvdata(pdev);
+ struct snd_soc_card *card = socdev->card;
+
+ if (!card->instantiated)
+ return;
+
+ /* Flush out pmdown_time work - we actually do want to run it
+ * now, we're shutting down so no imminent restart. */
+ run_delayed_work(&card->delayed_work);
+
+ snd_soc_dapm_shutdown(socdev);
+}
+
/* ASoC platform driver */
static struct platform_driver soc_driver = {
.driver = {
@@ -1030,6 +1045,7 @@ static struct platform_driver soc_driver = {
.remove = soc_remove,
.suspend = soc_suspend,
.resume = soc_resume,
+ .shutdown = soc_shutdown,
};
/* create a new pcm */