diff options
| author |   Vinod Koul <vinod.koul@intel.com> | 2016-03-15 16:39:27 +0530 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2016-03-16 10:08:43 +0000 |
| commit | 5b2fe89856b2d0faaaea9e4b4b2c4920de7a600c (patch) | |
| tree | d83890d11b337aca58553ae0d8e021e40f13c93d /sound/soc | |
| parent | ASoC: Intel: Skylake: Unmap the address last (diff) | |
| download | linux-dev-5b2fe89856b2d0faaaea9e4b4b2c4920de7a600c.tar.xz linux-dev-5b2fe89856b2d0faaaea9e4b4b2c4920de7a600c.zip | |
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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/intel/skylake/skl.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 6e916c3c3a4b..72971dc55c52 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -328,6 +328,8 @@ static int skl_free(struct hdac_ext_bus *ebus) snd_hdac_ext_bus_exit(ebus); + if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) + snd_hdac_i915_exit(&ebus->bus); return 0; } @@ -720,9 +722,6 @@ static void skl_remove(struct pci_dev *pci) if (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)) pm_runtime_get_noresume(&pci->dev); pci_dev_put(pci); |