From: Jo-Philipp Wich Date: Tue, 7 Jun 2016 09:13:03 +0000 (+0200) Subject: ixp4xx: fix Avila SoC audio driver compilation X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=69b45d2223e3069407be97fd7b76a14b8d195cee;p=openwrt%2Fstaging%2Frobimarko.git ixp4xx: fix Avila SoC audio driver compilation Upstream dropped the `dapm` member of `struct snd_soc_component`, requiring users to access it using `snd_soc_codec_get_dapm()` instead so change the driver code to do just that. Fixes the following build error spotted by the buildbots: CC [M] sound/soc/gw-avila/gw-avila.o sound/soc/gw-avila/gw-avila.c: In function 'avila_aic3x_init': sound/soc/gw-avila/gw-avila.c:104:44: error: 'struct snd_soc_codec' has no member named 'dapm' Signed-off-by: Jo-Philipp Wich --- diff --git a/target/linux/ixp4xx/patches-4.4/175-avila_hss_audio_support.patch b/target/linux/ixp4xx/patches-4.4/175-avila_hss_audio_support.patch index 2fd6be49df..72ccc00f30 100644 --- a/target/linux/ixp4xx/patches-4.4/175-avila_hss_audio_support.patch +++ b/target/linux/ixp4xx/patches-4.4/175-avila_hss_audio_support.patch @@ -641,7 +641,7 @@ +static int avila_aic3x_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_codec *codec = rtd->codec; -+ struct snd_soc_dapm_context *dapm = &codec->dapm; ++ struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); + + /* Add davinci-evm specific widgets */ + snd_soc_dapm_new_controls(dapm, aic3x_dapm_widgets,