diff options
Diffstat (limited to 'sound/soc/codecs/wm8955.c')
| -rw-r--r-- | sound/soc/codecs/wm8955.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c index f89ad6c9a80b..df1940fdbf69 100644 --- a/sound/soc/codecs/wm8955.c +++ b/sound/soc/codecs/wm8955.c | |||
| @@ -577,13 +577,14 @@ static const struct snd_soc_dapm_route wm8955_intercon[] = { | |||
| 577 | 577 | ||
| 578 | static int wm8955_add_widgets(struct snd_soc_codec *codec) | 578 | static int wm8955_add_widgets(struct snd_soc_codec *codec) |
| 579 | { | 579 | { |
| 580 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
| 581 | |||
| 580 | snd_soc_add_controls(codec, wm8955_snd_controls, | 582 | snd_soc_add_controls(codec, wm8955_snd_controls, |
| 581 | ARRAY_SIZE(wm8955_snd_controls)); | 583 | ARRAY_SIZE(wm8955_snd_controls)); |
| 582 | 584 | ||
| 583 | snd_soc_dapm_new_controls(codec, wm8955_dapm_widgets, | 585 | snd_soc_dapm_new_controls(dapm, wm8955_dapm_widgets, |
| 584 | ARRAY_SIZE(wm8955_dapm_widgets)); | 586 | ARRAY_SIZE(wm8955_dapm_widgets)); |
| 585 | 587 | snd_soc_dapm_add_routes(dapm, wm8955_intercon, | |
| 586 | snd_soc_dapm_add_routes(codec, wm8955_intercon, | ||
| 587 | ARRAY_SIZE(wm8955_intercon)); | 588 | ARRAY_SIZE(wm8955_intercon)); |
| 588 | 589 | ||
| 589 | return 0; | 590 | return 0; |
| @@ -786,7 +787,7 @@ static int wm8955_set_bias_level(struct snd_soc_codec *codec, | |||
| 786 | break; | 787 | break; |
| 787 | 788 | ||
| 788 | case SND_SOC_BIAS_STANDBY: | 789 | case SND_SOC_BIAS_STANDBY: |
| 789 | if (codec->bias_level == SND_SOC_BIAS_OFF) { | 790 | if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { |
| 790 | ret = regulator_bulk_enable(ARRAY_SIZE(wm8955->supplies), | 791 | ret = regulator_bulk_enable(ARRAY_SIZE(wm8955->supplies), |
| 791 | wm8955->supplies); | 792 | wm8955->supplies); |
| 792 | if (ret != 0) { | 793 | if (ret != 0) { |
| @@ -850,7 +851,7 @@ static int wm8955_set_bias_level(struct snd_soc_codec *codec, | |||
| 850 | wm8955->supplies); | 851 | wm8955->supplies); |
| 851 | break; | 852 | break; |
| 852 | } | 853 | } |
| 853 | codec->bias_level = level; | 854 | codec->dapm.bias_level = level; |
| 854 | return 0; | 855 | return 0; |
| 855 | } | 856 | } |
| 856 | 857 | ||
