aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2016-06-22 19:44:19 +0530
committerMark Brown <broonie@kernel.org>2016-06-22 16:01:05 +0100
commit2e9dc2b645f72dcd528edbad7e35fa34d7204020 (patch)
tree2c6adbe174f947ad0c0ee56e5983e304e2077e6d
parentASoC: Intel: Revert "ASoC: Intel: Add support for PM ops in bxt-rt298" (diff)
downloadlinux-dev-2e9dc2b645f72dcd528edbad7e35fa34d7204020.tar.xz
linux-dev-2e9dc2b645f72dcd528edbad7e35fa34d7204020.zip
ASoC: Intel: Skylake: Disable async suspend
We do not support async suspend due to dependency with rest of card and require suspend/resume be executed synchronously, mark the device accordingly. Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/intel/skylake/skl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 734072c79205..720efb9fd995 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -668,6 +668,8 @@ static int skl_probe(struct pci_dev *pci,
skl->pci_id = pci->device;
+ device_disable_async_suspend(bus->dev);
+
skl->nhlt = skl_nhlt_init(bus->dev);
if (skl->nhlt == NULL)