diff options
author | jassi brar <jassisinghbrar@gmail.com> | 2010-02-22 01:58:04 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-02-22 09:14:58 -0500 |
commit | d273ebe77a780d3aba1f5b86615af3b0e87b76bf (patch) | |
tree | fd863113cd506960992495659e13aa1c7a4ef315 /sound/soc/soc-core.c | |
parent | 6c5f1fed49f96a0600aa9a97ac3faf972c33a341 (diff) |
ASoC: Pass dai_link as argument to platform suspend and resume
Passing pointer to relevant dai_link provides easier reach to the
ASoC tree in suspend/resume of snd_soc_platform. It also provides
direct access to the dai at the other end of the dai_link.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r-- | sound/soc/soc-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e1c0336868e1..524a85a73aca 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -854,7 +854,7 @@ static int soc_suspend(struct device *dev) | |||
854 | if (cpu_dai->suspend && !cpu_dai->ac97_control) | 854 | if (cpu_dai->suspend && !cpu_dai->ac97_control) |
855 | cpu_dai->suspend(cpu_dai); | 855 | cpu_dai->suspend(cpu_dai); |
856 | if (platform->suspend) | 856 | if (platform->suspend) |
857 | platform->suspend(cpu_dai); | 857 | platform->suspend(&card->dai_link[i]); |
858 | } | 858 | } |
859 | 859 | ||
860 | /* close any waiting streams and save state */ | 860 | /* close any waiting streams and save state */ |
@@ -943,7 +943,7 @@ static void soc_resume_deferred(struct work_struct *work) | |||
943 | if (cpu_dai->resume && !cpu_dai->ac97_control) | 943 | if (cpu_dai->resume && !cpu_dai->ac97_control) |
944 | cpu_dai->resume(cpu_dai); | 944 | cpu_dai->resume(cpu_dai); |
945 | if (platform->resume) | 945 | if (platform->resume) |
946 | platform->resume(cpu_dai); | 946 | platform->resume(&card->dai_link[i]); |
947 | } | 947 | } |
948 | 948 | ||
949 | if (card->resume_post) | 949 | if (card->resume_post) |