From: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Date: Thu, 10 Jan 2008 13:39:01 +0000 (+0100)
Subject: [ALSA] soc - Ensure PCMs are suspended
X-Git-Tag: v2.6.25-rc1~1127^2~137
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ccab3e72e211c40d868045c7d3216948999bcf7;p=linux-2.6

[ALSA] soc - Ensure PCMs are suspended

This fixes a bug whereby PCMs were not being suspended when the rest of the
audio subsystem was suspended.

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 0afcdfe42a..6b51ff2269 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -447,6 +447,9 @@ struct snd_soc_dai_link  {
 
 	/* codec/machine specific init - e.g. add machine controls */
 	int (*init)(struct snd_soc_codec *codec);
+
+	/* DAI pcm */
+	struct snd_pcm *pcm;
 };
 
 /* SoC machine */
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 7d51be8ee0..5f86e03309 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -645,6 +645,10 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state)
 			dai->dai_ops.digital_mute(dai, 1);
 	}
 
+	/* suspend all pcms */
+	for (i = 0; i < machine->num_links; i++)
+		snd_pcm_suspend_all(machine->dai_link[i].pcm);
+
 	if (machine->suspend_pre)
 		machine->suspend_pre(pdev, state);
 
@@ -879,6 +883,7 @@ static int soc_new_pcm(struct snd_soc_device *socdev,
 		return ret;
 	}
 
+	dai_link->pcm = pcm;
 	pcm->private_data = rtd;
 	soc_pcm_ops.mmap = socdev->platform->pcm_ops->mmap;
 	soc_pcm_ops.pointer = socdev->platform->pcm_ops->pointer;