All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jie Yang <yang.jie@intel.com>
To: broonie@kernel.org
Cc: alsa-devel@alsa-project.org, liam.r.girdwood@intel.com
Subject: [PATCH] ASoC: Intel: fix a compiling issue
Date: Mon, 13 Apr 2015 10:47:30 +0800	[thread overview]
Message-ID: <1428893250-21092-1-git-send-email-yang.jie@intel.com> (raw)

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@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

             reply	other threads:[~2015-04-13  2:44 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-13  2:47 Jie Yang [this message]
2015-04-13  4:50 ` [PATCH] ASoC: Intel: fix a compiling issue Michael Trimarchi
2015-04-16  8:17   ` Keyon
2015-04-18 12:11 ` Mark Brown
2015-04-18 12:19   ` Michael Trimarchi
2015-04-18 17:03     ` Mark Brown
2015-04-19  1:39       ` Jie, Yang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1428893250-21092-1-git-send-email-yang.jie@intel.com \
    --to=yang.jie@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=liam.r.girdwood@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.