aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2016-06-07 11:13:03 +0200
committerJo-Philipp Wich <jo@mein.io>2016-06-07 11:15:55 +0200
commit69b45d2223e3069407be97fd7b76a14b8d195cee (patch)
tree79057348fa540528280eddb5542086c6a0705e02 /target/linux/ixp4xx
parent160913f9debcc0193b2a481f2c63c489058d243d (diff)
downloadupstream-69b45d2223e3069407be97fd7b76a14b8d195cee.tar.gz
upstream-69b45d2223e3069407be97fd7b76a14b8d195cee.tar.bz2
upstream-69b45d2223e3069407be97fd7b76a14b8d195cee.zip
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 <jo@mein.io>
Diffstat (limited to 'target/linux/ixp4xx')
-rw-r--r--target/linux/ixp4xx/patches-4.4/175-avila_hss_audio_support.patch2
1 files changed, 1 insertions, 1 deletions
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,