Merge branch 'topic/hda-link-time' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorMark Brown <broonie@kernel.org>
Tue, 9 Aug 2016 11:34:51 +0000 (12:34 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 9 Aug 2016 11:34:51 +0000 (12:34 +0100)
1  2 
sound/soc/intel/skylake/skl-messages.c
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");