diff options
Diffstat (limited to 'sound/soc/codecs/wm9081.c')
-rw-r--r-- | sound/soc/codecs/wm9081.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c index ecc7c37180c7..c03e2c3e24e1 100644 --- a/sound/soc/codecs/wm9081.c +++ b/sound/soc/codecs/wm9081.c | |||
@@ -805,7 +805,7 @@ static int wm9081_set_bias_level(struct snd_soc_codec *codec, | |||
805 | 805 | ||
806 | case SND_SOC_BIAS_STANDBY: | 806 | case SND_SOC_BIAS_STANDBY: |
807 | /* Initial cold start */ | 807 | /* Initial cold start */ |
808 | if (codec->bias_level == SND_SOC_BIAS_OFF) { | 808 | if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { |
809 | /* Disable LINEOUT discharge */ | 809 | /* Disable LINEOUT discharge */ |
810 | reg = snd_soc_read(codec, WM9081_ANTI_POP_CONTROL); | 810 | reg = snd_soc_read(codec, WM9081_ANTI_POP_CONTROL); |
811 | reg &= ~WM9081_LINEOUT_DISCH; | 811 | reg &= ~WM9081_LINEOUT_DISCH; |
@@ -865,7 +865,7 @@ static int wm9081_set_bias_level(struct snd_soc_codec *codec, | |||
865 | break; | 865 | break; |
866 | } | 866 | } |
867 | 867 | ||
868 | codec->bias_level = level; | 868 | codec->dapm.bias_level = level; |
869 | 869 | ||
870 | return 0; | 870 | return 0; |
871 | } | 871 | } |
@@ -1228,6 +1228,7 @@ static struct snd_soc_dai_driver wm9081_dai = { | |||
1228 | static int wm9081_probe(struct snd_soc_codec *codec) | 1228 | static int wm9081_probe(struct snd_soc_codec *codec) |
1229 | { | 1229 | { |
1230 | struct wm9081_priv *wm9081 = snd_soc_codec_get_drvdata(codec); | 1230 | struct wm9081_priv *wm9081 = snd_soc_codec_get_drvdata(codec); |
1231 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
1231 | int ret; | 1232 | int ret; |
1232 | u16 reg; | 1233 | u16 reg; |
1233 | 1234 | ||
@@ -1269,9 +1270,9 @@ static int wm9081_probe(struct snd_soc_codec *codec) | |||
1269 | ARRAY_SIZE(wm9081_eq_controls)); | 1270 | ARRAY_SIZE(wm9081_eq_controls)); |
1270 | } | 1271 | } |
1271 | 1272 | ||
1272 | snd_soc_dapm_new_controls(codec, wm9081_dapm_widgets, | 1273 | snd_soc_dapm_new_controls(dapm, wm9081_dapm_widgets, |
1273 | ARRAY_SIZE(wm9081_dapm_widgets)); | 1274 | ARRAY_SIZE(wm9081_dapm_widgets)); |
1274 | snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths)); | 1275 | snd_soc_dapm_add_routes(dapm, audio_paths, ARRAY_SIZE(audio_paths)); |
1275 | 1276 | ||
1276 | return ret; | 1277 | return ret; |
1277 | } | 1278 | } |