diff options
Diffstat (limited to 'sound/soc/codecs/wm8750.c')
-rw-r--r-- | sound/soc/codecs/wm8750.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 6c924cd2cfd4..178b967af73f 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c | |||
@@ -399,10 +399,11 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
399 | 399 | ||
400 | static int wm8750_add_widgets(struct snd_soc_codec *codec) | 400 | static int wm8750_add_widgets(struct snd_soc_codec *codec) |
401 | { | 401 | { |
402 | snd_soc_dapm_new_controls(codec, wm8750_dapm_widgets, | 402 | struct snd_soc_dapm_context *dapm = &codec->dapm; |
403 | ARRAY_SIZE(wm8750_dapm_widgets)); | ||
404 | 403 | ||
405 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 404 | snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets, |
405 | ARRAY_SIZE(wm8750_dapm_widgets)); | ||
406 | snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); | ||
406 | 407 | ||
407 | return 0; | 408 | return 0; |
408 | } | 409 | } |
@@ -615,7 +616,7 @@ static int wm8750_set_bias_level(struct snd_soc_codec *codec, | |||
615 | case SND_SOC_BIAS_PREPARE: | 616 | case SND_SOC_BIAS_PREPARE: |
616 | break; | 617 | break; |
617 | case SND_SOC_BIAS_STANDBY: | 618 | case SND_SOC_BIAS_STANDBY: |
618 | if (codec->bias_level == SND_SOC_BIAS_OFF) { | 619 | if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { |
619 | /* Set VMID to 5k */ | 620 | /* Set VMID to 5k */ |
620 | snd_soc_write(codec, WM8750_PWR1, pwr_reg | 0x01c1); | 621 | snd_soc_write(codec, WM8750_PWR1, pwr_reg | 0x01c1); |
621 | 622 | ||
@@ -630,7 +631,7 @@ static int wm8750_set_bias_level(struct snd_soc_codec *codec, | |||
630 | snd_soc_write(codec, WM8750_PWR1, 0x0001); | 631 | snd_soc_write(codec, WM8750_PWR1, 0x0001); |
631 | break; | 632 | break; |
632 | } | 633 | } |
633 | codec->bias_level = level; | 634 | codec->dapm.bias_level = level; |
634 | return 0; | 635 | return 0; |
635 | } | 636 | } |
636 | 637 | ||