diff options
Diffstat (limited to 'sound/soc/codecs/wm8978.c')
-rw-r--r-- | sound/soc/codecs/wm8978.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index 13b979a71a7c..ac43b6088e2e 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c | |||
@@ -355,11 +355,12 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
355 | 355 | ||
356 | static int wm8978_add_widgets(struct snd_soc_codec *codec) | 356 | static int wm8978_add_widgets(struct snd_soc_codec *codec) |
357 | { | 357 | { |
358 | snd_soc_dapm_new_controls(codec, wm8978_dapm_widgets, | 358 | struct snd_soc_dapm_context *dapm = &codec->dapm; |
359 | ARRAY_SIZE(wm8978_dapm_widgets)); | ||
360 | 359 | ||
360 | snd_soc_dapm_new_controls(dapm, wm8978_dapm_widgets, | ||
361 | ARRAY_SIZE(wm8978_dapm_widgets)); | ||
361 | /* set up the WM8978 audio map */ | 362 | /* set up the WM8978 audio map */ |
362 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 363 | snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); |
363 | 364 | ||
364 | return 0; | 365 | return 0; |
365 | } | 366 | } |
@@ -837,7 +838,7 @@ static int wm8978_set_bias_level(struct snd_soc_codec *codec, | |||
837 | /* bit 3: enable bias, bit 2: enable I/O tie off buffer */ | 838 | /* bit 3: enable bias, bit 2: enable I/O tie off buffer */ |
838 | power1 |= 0xc; | 839 | power1 |= 0xc; |
839 | 840 | ||
840 | if (codec->bias_level == SND_SOC_BIAS_OFF) { | 841 | if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { |
841 | /* Initial cap charge at VMID 5k */ | 842 | /* Initial cap charge at VMID 5k */ |
842 | snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1, | 843 | snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1, |
843 | power1 | 0x3); | 844 | power1 | 0x3); |
@@ -857,7 +858,7 @@ static int wm8978_set_bias_level(struct snd_soc_codec *codec, | |||
857 | 858 | ||
858 | dev_dbg(codec->dev, "%s: %d, %x\n", __func__, level, power1); | 859 | dev_dbg(codec->dev, "%s: %d, %x\n", __func__, level, power1); |
859 | 860 | ||
860 | codec->bias_level = level; | 861 | codec->dapm.bias_level = level; |
861 | return 0; | 862 | return 0; |
862 | } | 863 | } |
863 | 864 | ||