summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2016-08-24 12:33:13 (GMT)
committerMark Brown <broonie@kernel.org>2016-09-01 20:27:41 (GMT)
commitc15ad605be164dd425c32af730376b6ad71d6cb3 (patch)
tree53e3a37ca1314cac342f4fcedeb7fbeb69a89d4b /sound/soc
parent541070cec4f9be18ce9fcc74ac5e1036965ceb63 (diff)
downloadlinux-c15ad605be164dd425c32af730376b6ad71d6cb3.tar.xz
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')
-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 108ebb9..6bceab8 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);