diff options
| author | Mark Brown <broonie@kernel.org> | 2017-03-29 12:55:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-03-29 12:55:05 +0100 |
| commit | 4368c27666df1f1e80aa525baf49d29073c28ce7 (patch) | |
| tree | 7b2c6b754fb620a17c0ef076a561f18be2f90905 /sound | |
| parent | d6c098a1db468b7fd4635e831f276851dfd8852c (diff) | |
| parent | d1a6fe41d3c4ff0d26f0b186d774493555ca5282 (diff) | |
| download | linux-stable-4368c27666df1f1e80aa525baf49d29073c28ce7.tar.gz linux-stable-4368c27666df1f1e80aa525baf49d29073c28ce7.tar.bz2 linux-stable-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.c | 2 |
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; |