[alsa-devel] [PATCH] ASoC: Intel: fix a compiling issue

Jie Yang yang.jie at intel.com
Mon Apr 13 04:47:30 CEST 2015


Fix the compiling issue that we don't have snd_soc_suspend/resume()
when CONFIG_PM_SLEEP is not defined.

Signed-off-by: Jie Yang <yang.jie at intel.com>
---
 sound/soc/intel/haswell/sst-haswell-pcm.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sound/soc/intel/haswell/sst-haswell-pcm.c b/sound/soc/intel/haswell/sst-haswell-pcm.c
index 23ae040..f84eb14 100644
--- a/sound/soc/intel/haswell/sst-haswell-pcm.c
+++ b/sound/soc/intel/haswell/sst-haswell-pcm.c
@@ -1313,8 +1313,9 @@ static void hsw_pcm_complete(struct device *dev)
 			dev_err(dev, "failed to restore context for PCM %d\n", i);
 	}
 
+#ifdef CONFIG_PM_SLEEP
 	snd_soc_resume(pdata->soc_card->dev);
-
+#endif
 	err = sst_hsw_dsp_runtime_resume(hsw);
 	if (err < 0)
 		return;
@@ -1367,7 +1368,9 @@ static int hsw_pcm_prepare(struct device *dev)
 		sst_hsw_dsp_runtime_sleep(hsw);
 	}
 
+#ifdef CONFIG_PM_SLEEP
 	snd_soc_suspend(pdata->soc_card->dev);
+#endif
 	snd_soc_poweroff(pdata->soc_card->dev);
 
 	pdata->pm_state = HSW_PM_STATE_D3;
-- 
1.9.1



More information about the Alsa-devel mailing list