summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-03-29 13:55:05 +0200
committerMark Brown <broonie@kernel.org>2017-03-29 13:55:05 +0200
commit4368c27666df1f1e80aa525baf49d29073c28ce7 (patch)
tree7b2c6b754fb620a17c0ef076a561f18be2f90905 /sound
parentASoC: don't dereference NULL pcm_{new,free} (diff)
parentASoC: Intel: Skylake: fix invalid memory access due to wrong reference of poi... (diff)
downloadlinux-4368c27666df1f1e80aa525baf49d29073c28ce7.tar.xz
linux-4368c27666df1f1e80aa525baf49d29073c28ce7.zip
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/intel/skylake/skl-topology.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index ed58b5b3555a..2dbfb1b24ef4 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -512,7 +512,7 @@ static int skl_tplg_set_module_init_data(struct snd_soc_dapm_widget *w)
if (bc->set_params != SKL_PARAM_INIT)
continue;
- mconfig->formats_config.caps = (u32 *)&bc->params;
+ mconfig->formats_config.caps = (u32 *)bc->params;
mconfig->formats_config.caps_size = bc->size;
break;