From: Mark Brown <broonie@kernel.org>
Date: Tue, 9 Aug 2016 11:34:51 +0000 (+0100)
Subject: Merge branch 'topic/hda-link-time' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=da74273c49ebd7049fddc4af3845881c74e00f38;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'topic/hda-link-time' of git://git./linux/kernel/git/tiwai/sound into asoc-intel
---

da74273c49ebd7049fddc4af3845881c74e00f38
diff --cc sound/soc/intel/skylake/skl-pcm.c
index 22d4f0703a33,5ae86c227d45..140249269cdb
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@@ -1142,11 -1142,9 +1142,11 @@@ static int skl_platform_soc_probe(struc
  {
  	struct hdac_ext_bus *ebus = dev_get_drvdata(platform->dev);
  	struct skl *skl = ebus_to_skl(ebus);
 +	const struct skl_dsp_ops *ops;
  	int ret;
  
 +	pm_runtime_get_sync(platform->dev);
- 	if (ebus->ppcap) {
+ 	if ((ebus_to_hbus(ebus))->ppcap) {
  		ret = skl_tplg_init(platform, ebus);
  		if (ret < 0) {
  			dev_err(platform->dev, "Failed to init topology!\n");