diff options
Diffstat (limited to 'sound/soc/samsung/smartq_wm8987.c')
-rw-r--r-- | sound/soc/samsung/smartq_wm8987.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/samsung/smartq_wm8987.c b/sound/soc/samsung/smartq_wm8987.c index d6a340b8c3f7..0a46fa8730d1 100644 --- a/sound/soc/samsung/smartq_wm8987.c +++ b/sound/soc/samsung/smartq_wm8987.c | |||
@@ -39,8 +39,8 @@ static int smartq_hifi_hw_params(struct snd_pcm_substream *substream, | |||
39 | struct snd_pcm_hw_params *params) | 39 | struct snd_pcm_hw_params *params) |
40 | { | 40 | { |
41 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 41 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
42 | struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; | 42 | struct snd_soc_dai *codec_dai = rtd->codec_dai; |
43 | struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; | 43 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; |
44 | unsigned int clk = 0; | 44 | unsigned int clk = 0; |
45 | int ret; | 45 | int ret; |
46 | 46 | ||
@@ -153,8 +153,9 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
153 | {"LINPUT2", NULL, "Mic Bias"}, | 153 | {"LINPUT2", NULL, "Mic Bias"}, |
154 | }; | 154 | }; |
155 | 155 | ||
156 | static int smartq_wm8987_init(struct snd_soc_codec *codec) | 156 | static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd) |
157 | { | 157 | { |
158 | struct snd_soc_codec *codec = rtd->codec; | ||
158 | struct snd_soc_dapm_context *dapm = &codec->dapm; | 159 | struct snd_soc_dapm_context *dapm = &codec->dapm; |
159 | int err = 0; | 160 | int err = 0; |
160 | 161 | ||
@@ -188,7 +189,7 @@ static int smartq_wm8987_init(struct snd_soc_codec *codec) | |||
188 | return err; | 189 | return err; |
189 | 190 | ||
190 | /* Headphone jack detection */ | 191 | /* Headphone jack detection */ |
191 | err = snd_soc_jack_new(&snd_soc_smartq, "Headphone Jack", | 192 | err = snd_soc_jack_new(codec, "Headphone Jack", |
192 | SND_JACK_HEADPHONE, &smartq_jack); | 193 | SND_JACK_HEADPHONE, &smartq_jack); |
193 | if (err) | 194 | if (err) |
194 | return err; | 195 | return err; |