diff options
Diffstat (limited to 'sound/soc/codecs/wm8988.c')
-rw-r--r-- | sound/soc/codecs/wm8988.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c index d7f259711970..0bc2eb530c7a 100644 --- a/sound/soc/codecs/wm8988.c +++ b/sound/soc/codecs/wm8988.c | |||
@@ -677,7 +677,7 @@ static int wm8988_set_bias_level(struct snd_soc_codec *codec, | |||
677 | break; | 677 | break; |
678 | 678 | ||
679 | case SND_SOC_BIAS_STANDBY: | 679 | case SND_SOC_BIAS_STANDBY: |
680 | if (codec->bias_level == SND_SOC_BIAS_OFF) { | 680 | if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { |
681 | /* VREF, VMID=2x5k */ | 681 | /* VREF, VMID=2x5k */ |
682 | snd_soc_write(codec, WM8988_PWR1, pwr_reg | 0x1c1); | 682 | snd_soc_write(codec, WM8988_PWR1, pwr_reg | 0x1c1); |
683 | 683 | ||
@@ -693,7 +693,7 @@ static int wm8988_set_bias_level(struct snd_soc_codec *codec, | |||
693 | snd_soc_write(codec, WM8988_PWR1, 0x0000); | 693 | snd_soc_write(codec, WM8988_PWR1, 0x0000); |
694 | break; | 694 | break; |
695 | } | 695 | } |
696 | codec->bias_level = level; | 696 | codec->dapm.bias_level = level; |
697 | return 0; | 697 | return 0; |
698 | } | 698 | } |
699 | 699 | ||
@@ -759,6 +759,7 @@ static int wm8988_resume(struct snd_soc_codec *codec) | |||
759 | static int wm8988_probe(struct snd_soc_codec *codec) | 759 | static int wm8988_probe(struct snd_soc_codec *codec) |
760 | { | 760 | { |
761 | struct wm8988_priv *wm8988 = snd_soc_codec_get_drvdata(codec); | 761 | struct wm8988_priv *wm8988 = snd_soc_codec_get_drvdata(codec); |
762 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
762 | int ret = 0; | 763 | int ret = 0; |
763 | u16 reg; | 764 | u16 reg; |
764 | 765 | ||
@@ -790,9 +791,9 @@ static int wm8988_probe(struct snd_soc_codec *codec) | |||
790 | 791 | ||
791 | snd_soc_add_controls(codec, wm8988_snd_controls, | 792 | snd_soc_add_controls(codec, wm8988_snd_controls, |
792 | ARRAY_SIZE(wm8988_snd_controls)); | 793 | ARRAY_SIZE(wm8988_snd_controls)); |
793 | snd_soc_dapm_new_controls(codec, wm8988_dapm_widgets, | 794 | snd_soc_dapm_new_controls(dapm, wm8988_dapm_widgets, |
794 | ARRAY_SIZE(wm8988_dapm_widgets)); | 795 | ARRAY_SIZE(wm8988_dapm_widgets)); |
795 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 796 | snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); |
796 | 797 | ||
797 | return 0; | 798 | return 0; |
798 | } | 799 | } |