diff options
author | Mark Brown <broonie@kernel.org> | 2018-04-18 15:40:41 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-04-18 15:49:41 +0100 |
commit | 24ada03555505205b0c8b8b796d52926600bf947 (patch) | |
tree | f6ad7d3b85ea6ad4b0b7434aec1d96ccfea0c7ff /sound/soc/intel/skylake/skl-pcm.c | |
parent | 221dd96c30a7c65b24ead7fdd7645abb99506ce2 (diff) |
ASoC: topology: Fix build errors
The two commits:
81e9b0a07889 ASoC: topology: Give more data to clients via callbacks
28aa6f7779f7 ASoC: topology: Add callback for DAPM route load/unload
break the build so revert them.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/skylake/skl-pcm.c')
-rw-r--r-- | sound/soc/intel/skylake/skl-pcm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index 1f4dd08d36c5..afa86b9e4dcf 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -1017,11 +1017,10 @@ static struct snd_soc_dai_driver skl_platform_dai[] = { }, }; -int skl_dai_load(struct snd_soc_component *cmp, int index, - struct snd_soc_dai_driver *dai_drv, - struct snd_soc_tplg_pcm *pcm, struct snd_soc_dai *dai) +int skl_dai_load(struct snd_soc_component *cmp, + struct snd_soc_dai_driver *pcm_dai) { - dai_drv->ops = &skl_pcm_dai_ops; + pcm_dai->ops = &skl_pcm_dai_ops; return 0; } |