diff options
author | Mark Brown <broonie@kernel.org> | 2016-01-05 18:06:29 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-01-05 18:06:29 +0000 |
commit | ee1e4e3f0d50aebdc6dac2a2cd4ae203ed2a75c1 (patch) | |
tree | 3ae1d5d33402f3459a65fe492c97d75c168bb04c /sound/soc/intel/skylake/skl.c | |
parent | 55fc205600ff3b529631cfe03b58645e3844bd92 (diff) | |
parent | d8018361b58bb7b9a2a657104e54c33c2ef1439d (diff) | |
download | op-kernel-dev-ee1e4e3f0d50aebdc6dac2a2cd4ae203ed2a75c1.zip op-kernel-dev-ee1e4e3f0d50aebdc6dac2a2cd4ae203ed2a75c1.tar.gz |
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'sound/soc/intel/skylake/skl.c')
-rw-r--r-- | sound/soc/intel/skylake/skl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index c38bf99..b69649a 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -25,6 +25,7 @@ #include <linux/pci.h> #include <linux/pm_runtime.h> #include <linux/platform_device.h> +#include <linux/firmware.h> #include <sound/pcm.h> #include "../common/sst-acpi.h" #include "skl.h" @@ -585,6 +586,9 @@ static void skl_remove(struct pci_dev *pci) struct hdac_ext_bus *ebus = pci_get_drvdata(pci); struct skl *skl = ebus_to_skl(ebus); + if (skl->tplg) + release_firmware(skl->tplg); + if (pci_dev_run_wake(pci)) pm_runtime_get_noresume(&pci->dev); pci_dev_put(pci); |