summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/skylake/skl-topology.c
diff options
context:
space:
mode:
authorVinod Koul2016-08-24 14:33:13 +0200
committerMark Brown2016-09-01 22:27:41 +0200
commitc15ad605be164dd425c32af730376b6ad71d6cb3 (patch)
tree53e3a37ca1314cac342f4fcedeb7fbeb69a89d4b /sound/soc/intel/skylake/skl-topology.c
parentASoC: Intel: Skylake: Parse manifest data (diff)
downloadkernel-qcow2-linux-c15ad605be164dd425c32af730376b6ad71d6cb3.tar.gz
kernel-qcow2-linux-c15ad605be164dd425c32af730376b6ad71d6cb3.tar.xz
kernel-qcow2-linux-c15ad605be164dd425c32af730376b6ad71d6cb3.zip
ASoC: Intel: Skylake: check manifest size
For some platforms manifest data may not be defined, thus the private data would not be defined as well. So check the size of private data and proceed only if it is valid. Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/skylake/skl-topology.c')
-rw-r--r--sound/soc/intel/skylake/skl-topology.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 108ebb9ab329..6bceab8f0bac 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -2401,6 +2401,10 @@ static int skl_manifest_load(struct snd_soc_component *cmpnt,
struct skl *skl = ebus_to_skl(ebus);
int ret = 0;
+ /* proceed only if we have private data defined */
+ if (manifest->priv.size == 0)
+ return 0;
+
minfo = &skl->skl_sst->manifest;
skl_tplg_get_manifest_data(manifest, bus->dev, minfo);