diff options
| author | Mark Brown <broonie@kernel.org> | 2016-09-29 12:43:59 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-09-29 12:43:59 -0700 |
| commit | 4a2447b483e17c580ed1d7c9cde3267d9c3a380f (patch) | |
| tree | d4845df7d877abe55229b97f16359509c1eea140 /sound/soc/intel/skylake/skl.c | |
| parent | 00f12dbd3c33bb46b2d5e122406410b325b2c77d (diff) | |
| parent | 0730bd2e2ade00d88647b13a0c17cde254ddf56e (diff) | |
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'sound/soc/intel/skylake/skl.c')
| -rw-r--r-- | sound/soc/intel/skylake/skl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index e3e764167765..2989c164dafe 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -587,7 +587,7 @@ static int skl_first_init(struct hdac_ext_bus *ebus) return -ENXIO; } - snd_hdac_ext_bus_parse_capabilities(ebus); + snd_hdac_bus_parse_capabilities(bus); if (skl_acquire_irq(ebus, 0) < 0) return -EBUSY; @@ -684,7 +684,7 @@ static int skl_probe(struct pci_dev *pci, skl_dmic_data.dmic_num = skl_get_dmic_geo(skl); /* check if dsp is there */ - if (ebus->ppcap) { + if (bus->ppcap) { err = skl_machine_device_register(skl, (void *)pci_id->driver_data); if (err < 0) @@ -698,7 +698,7 @@ static int skl_probe(struct pci_dev *pci, skl->skl_sst->enable_miscbdcge = skl_enable_miscbdcge; } - if (ebus->mlcap) + if (bus->mlcap) snd_hdac_ext_bus_get_ml_capabilities(ebus); /* create device for soc dmic */ |