Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc42f363 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

parents 84a5347b d8018361

sound/soc/intel/skylake/skl-topology.c

+2 −1
Original line number Diff line number Diff line
@@ -1240,7 +1240,6 @@ int skl_tplg_init(struct snd_soc_platform *platform, struct hdac_ext_bus *ebus) 
	 */

	ret = snd_soc_tplg_component_load(&platform->component,

					&skl_tplg_ops, fw, 0);

	release_firmware(fw);

	if (ret < 0) {

		dev_err(bus->dev, "tplg component load failed%d\n", ret);

		return -EINVAL;
@@ -1249,5 +1248,7 @@ int skl_tplg_init(struct snd_soc_platform *platform, struct hdac_ext_bus *ebus) 
	skl->resource.max_mcps = SKL_MAX_MCPS;

	skl->resource.max_mem = SKL_FW_MAX_MEM;



	skl->tplg = fw;



	return 0;

}

sound/soc/intel/skylake/skl.c

+4 −0
Original line number Diff line number Diff line
@@ -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 "skl.h"
@@ -520,6 +521,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);

sound/soc/intel/skylake/skl.h

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ struct skl { 
	struct skl_dsp_resource resource;

	struct list_head ppl_list;

	struct list_head dapm_path_list;



	const struct firmware *tplg;

};



#define skl_to_ebus(s)	(&(s)->ebus)