aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/jz4740
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/jz4740')
-rw-r--r--sound/soc/jz4740/qi_lb60.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c
index ef1a99e6a3bd..70afbfada9fd 100644
--- a/sound/soc/jz4740/qi_lb60.c
+++ b/sound/soc/jz4740/qi_lb60.c
@@ -59,10 +59,11 @@ static int qi_lb60_codec_init(struct snd_soc_pcm_runtime *rtd)
59{ 59{
60 struct snd_soc_codec *codec = rtd->codec; 60 struct snd_soc_codec *codec = rtd->codec;
61 struct snd_soc_dai *cpu_dai = rtd->cpu_dai; 61 struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
62 struct snd_soc_dapm_context *dapm = &codec->dapm;
62 int ret; 63 int ret;
63 64
64 snd_soc_dapm_nc_pin(codec, "LIN"); 65 snd_soc_dapm_nc_pin(dapm, "LIN");
65 snd_soc_dapm_nc_pin(codec, "RIN"); 66 snd_soc_dapm_nc_pin(dapm, "RIN");
66 67
67 ret = snd_soc_dai_set_fmt(cpu_dai, QI_LB60_DAIFMT); 68 ret = snd_soc_dai_set_fmt(cpu_dai, QI_LB60_DAIFMT);
68 if (ret < 0) { 69 if (ret < 0) {
@@ -70,9 +71,11 @@ static int qi_lb60_codec_init(struct snd_soc_pcm_runtime *rtd)
70 return ret; 71 return ret;
71 } 72 }
72 73
73 snd_soc_dapm_new_controls(codec, qi_lb60_widgets, ARRAY_SIZE(qi_lb60_widgets)); 74 snd_soc_dapm_new_controls(dapm, qi_lb60_widgets,
74 snd_soc_dapm_add_routes(codec, qi_lb60_routes, ARRAY_SIZE(qi_lb60_routes)); 75 ARRAY_SIZE(qi_lb60_widgets));
75 snd_soc_dapm_sync(codec); 76 snd_soc_dapm_add_routes(dapm, qi_lb60_routes,
77 ARRAY_SIZE(qi_lb60_routes));
78 snd_soc_dapm_sync(dapm);
76 79
77 return 0; 80 return 0;
78} 81}