forked from Minki/linux
ASoC: Intel: Skylake: Call i915 exit last
The Skylake driver uses i915 component APIs to talk to display. On remove we should free up by invoking snd_hdac_i915_exit() but that should be last thing in remove routine, so move it to last in skl_free() Signed-off-by: Jeeja KP <jeeja.kp@intel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
077411e5eb
commit
5b2fe89856
@ -328,6 +328,8 @@ static int skl_free(struct hdac_ext_bus *ebus)
|
|||||||
|
|
||||||
snd_hdac_ext_bus_exit(ebus);
|
snd_hdac_ext_bus_exit(ebus);
|
||||||
|
|
||||||
|
if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI))
|
||||||
|
snd_hdac_i915_exit(&ebus->bus);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -720,9 +722,6 @@ static void skl_remove(struct pci_dev *pci)
|
|||||||
if (skl->tplg)
|
if (skl->tplg)
|
||||||
release_firmware(skl->tplg);
|
release_firmware(skl->tplg);
|
||||||
|
|
||||||
if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI))
|
|
||||||
snd_hdac_i915_exit(&ebus->bus);
|
|
||||||
|
|
||||||
if (pci_dev_run_wake(pci))
|
if (pci_dev_run_wake(pci))
|
||||||
pm_runtime_get_noresume(&pci->dev);
|
pm_runtime_get_noresume(&pci->dev);
|
||||||
pci_dev_put(pci);
|
pci_dev_put(pci);
|
||||||
|
Loading…
Reference in New Issue
Block a user