Merge branch 'topic/hda-link-time' of git://git.kernel.org/pub/scm/linux/kernel/git...

diff --cc sound/soc/intel/skylake/skl-messages.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-pcm.c
index 22d4f0703a33fe667bf4474e230aa639ff2fff99,5ae86c227d453eceb39852cd50e4015483f44e3f..140249269cdbb09c8f5c2605aa3c5803eba6091c
--- 1/sound/soc/intel/skylake/skl-pcm.c
--- 2/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;
  
-       if (ebus->ppcap) {
 +      pm_runtime_get_sync(platform->dev);
+       if ((ebus_to_hbus(ebus))->ppcap) {
                ret = skl_tplg_init(platform, ebus);
                if (ret < 0) {
                        dev_err(platform->dev, "Failed to init topology!\n");