aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2016-08-24 08:33:13 -0400
committerMark Brown <broonie@kernel.org>2016-09-01 16:27:41 -0400
commitc15ad605be164dd425c32af730376b6ad71d6cb3 (patch)
tree53e3a37ca1314cac342f4fcedeb7fbeb69a89d4b
parent541070cec4f9be18ce9fcc74ac5e1036965ceb63 (diff)
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>
-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,
2401 struct skl *skl = ebus_to_skl(ebus); 2401 struct skl *skl = ebus_to_skl(ebus);
2402 int ret = 0; 2402 int ret = 0;
2403 2403
2404 /* proceed only if we have private data defined */
2405 if (manifest->priv.size == 0)
2406 return 0;
2407
2404 minfo = &skl->skl_sst->manifest; 2408 minfo = &skl->skl_sst->manifest;
2405 2409
2406 skl_tplg_get_manifest_data(manifest, bus->dev, minfo); 2410 skl_tplg_get_manifest_data(manifest, bus->dev, minfo);