diff options
Diffstat (limited to 'sound/soc/codecs/wm8903.c')
-rw-r--r-- | sound/soc/codecs/wm8903.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index 622b60238a82..4a6df4b69a04 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c | |||
@@ -923,10 +923,11 @@ static const struct snd_soc_dapm_route intercon[] = { | |||
923 | 923 | ||
924 | static int wm8903_add_widgets(struct snd_soc_codec *codec) | 924 | static int wm8903_add_widgets(struct snd_soc_codec *codec) |
925 | { | 925 | { |
926 | snd_soc_dapm_new_controls(codec, wm8903_dapm_widgets, | 926 | struct snd_soc_dapm_context *dapm = &codec->dapm; |
927 | ARRAY_SIZE(wm8903_dapm_widgets)); | ||
928 | 927 | ||
929 | snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon)); | 928 | snd_soc_dapm_new_controls(dapm, wm8903_dapm_widgets, |
929 | ARRAY_SIZE(wm8903_dapm_widgets)); | ||
930 | snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon)); | ||
930 | 931 | ||
931 | return 0; | 932 | return 0; |
932 | } | 933 | } |
@@ -946,7 +947,7 @@ static int wm8903_set_bias_level(struct snd_soc_codec *codec, | |||
946 | break; | 947 | break; |
947 | 948 | ||
948 | case SND_SOC_BIAS_STANDBY: | 949 | case SND_SOC_BIAS_STANDBY: |
949 | if (codec->bias_level == SND_SOC_BIAS_OFF) { | 950 | if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { |
950 | snd_soc_write(codec, WM8903_CLOCK_RATES_2, | 951 | snd_soc_write(codec, WM8903_CLOCK_RATES_2, |
951 | WM8903_CLK_SYS_ENA); | 952 | WM8903_CLK_SYS_ENA); |
952 | 953 | ||
@@ -991,7 +992,7 @@ static int wm8903_set_bias_level(struct snd_soc_codec *codec, | |||
991 | break; | 992 | break; |
992 | } | 993 | } |
993 | 994 | ||
994 | codec->bias_level = level; | 995 | codec->dapm.bias_level = level; |
995 | 996 | ||
996 | return 0; | 997 | return 0; |
997 | } | 998 | } |