diff options
| author |   Charles Keepax <ckeepax@opensource.cirrus.com> | 2018-08-15 13:11:35 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2018-08-15 15:52:20 +0100 |
| commit | 249dc49576fc953a7378b916c6a6d47ea81e4da2 (patch) | |
| tree | cb787548edd2c234aa106bf893f98776cb04425e /include/sound/soc-dapm.h | |
| parent | ASoC: Intel: Skylake: Acquire irq after RIRB allocation (diff) | |
| download | wireguard-linux-249dc49576fc953a7378b916c6a6d47ea81e4da2.tar.xz wireguard-linux-249dc49576fc953a7378b916c6a6d47ea81e4da2.zip | |
ASoC: dapm: Fix NULL pointer deference on CODEC to CODEC DAIs
Commit a655de808cbde ("ASoC: core: Allow topology to override
machine driver FE DAI link config.") caused soc_dai_hw_params to
be come dependent on the substream private_data being set with
a pointer to the snd_soc_pcm_runtime. Currently, CODEC to CODEC
links don't set this, which causes a NULL pointer dereference:
[<4069de54>] (soc_dai_hw_params) from
[<40694b68>] (snd_soc_dai_link_event+0x1a0/0x380)
Since the ASoC core in general assumes that the substream
private_data will be set to a pointer to the snd_soc_pcm_runtime,
update the CODEC to CODEC links to respect this.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/sound/soc-dapm.h')
| -rw-r--r-- | include/sound/soc-dapm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index af9ef16cc34d..fdaaafdc7a00 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -407,6 +407,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card); void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card); int snd_soc_dapm_new_pcm(struct snd_soc_card *card, + struct snd_soc_pcm_runtime *rtd, const struct snd_soc_pcm_stream *params, unsigned int num_params, struct snd_soc_dapm_widget *source, |