diff options
Diffstat (limited to 'sound/soc/codecs/wm8776.c')
-rw-r--r-- | sound/soc/codecs/wm8776.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index 04182c464e35..96474a40da8d 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c | |||
@@ -307,7 +307,7 @@ static int wm8776_set_bias_level(struct snd_soc_codec *codec, | |||
307 | case SND_SOC_BIAS_PREPARE: | 307 | case SND_SOC_BIAS_PREPARE: |
308 | break; | 308 | break; |
309 | case SND_SOC_BIAS_STANDBY: | 309 | case SND_SOC_BIAS_STANDBY: |
310 | if (codec->bias_level == SND_SOC_BIAS_OFF) { | 310 | if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { |
311 | /* Disable the global powerdown; DAPM does the rest */ | 311 | /* Disable the global powerdown; DAPM does the rest */ |
312 | snd_soc_update_bits(codec, WM8776_PWRDOWN, 1, 0); | 312 | snd_soc_update_bits(codec, WM8776_PWRDOWN, 1, 0); |
313 | } | 313 | } |
@@ -318,7 +318,7 @@ static int wm8776_set_bias_level(struct snd_soc_codec *codec, | |||
318 | break; | 318 | break; |
319 | } | 319 | } |
320 | 320 | ||
321 | codec->bias_level = level; | 321 | codec->dapm.bias_level = level; |
322 | return 0; | 322 | return 0; |
323 | } | 323 | } |
324 | 324 | ||
@@ -405,6 +405,7 @@ static int wm8776_resume(struct snd_soc_codec *codec) | |||
405 | static int wm8776_probe(struct snd_soc_codec *codec) | 405 | static int wm8776_probe(struct snd_soc_codec *codec) |
406 | { | 406 | { |
407 | struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec); | 407 | struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec); |
408 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
408 | int ret = 0; | 409 | int ret = 0; |
409 | 410 | ||
410 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8776->control_type); | 411 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8776->control_type); |
@@ -428,9 +429,9 @@ static int wm8776_probe(struct snd_soc_codec *codec) | |||
428 | 429 | ||
429 | snd_soc_add_controls(codec, wm8776_snd_controls, | 430 | snd_soc_add_controls(codec, wm8776_snd_controls, |
430 | ARRAY_SIZE(wm8776_snd_controls)); | 431 | ARRAY_SIZE(wm8776_snd_controls)); |
431 | snd_soc_dapm_new_controls(codec, wm8776_dapm_widgets, | 432 | snd_soc_dapm_new_controls(dapm, wm8776_dapm_widgets, |
432 | ARRAY_SIZE(wm8776_dapm_widgets)); | 433 | ARRAY_SIZE(wm8776_dapm_widgets)); |
433 | snd_soc_dapm_add_routes(codec, routes, ARRAY_SIZE(routes)); | 434 | snd_soc_dapm_add_routes(dapm, routes, ARRAY_SIZE(routes)); |
434 | 435 | ||
435 | return ret; | 436 | return ret; |
436 | } | 437 | } |