diff options
Diffstat (limited to 'sound/soc/codecs/wm2000.c')
-rw-r--r-- | sound/soc/codecs/wm2000.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index 4bcd168794e1..80ddf4fd23db 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include <sound/pcm.h> | 36 | #include <sound/pcm.h> |
37 | #include <sound/pcm_params.h> | 37 | #include <sound/pcm_params.h> |
38 | #include <sound/soc.h> | 38 | #include <sound/soc.h> |
39 | #include <sound/soc-dapm.h> | ||
40 | #include <sound/initval.h> | 39 | #include <sound/initval.h> |
41 | #include <sound/tlv.h> | 40 | #include <sound/tlv.h> |
42 | 41 | ||
@@ -705,6 +704,7 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
705 | /* Called from the machine driver */ | 704 | /* Called from the machine driver */ |
706 | int wm2000_add_controls(struct snd_soc_codec *codec) | 705 | int wm2000_add_controls(struct snd_soc_codec *codec) |
707 | { | 706 | { |
707 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
708 | int ret; | 708 | int ret; |
709 | 709 | ||
710 | if (!wm2000_i2c) { | 710 | if (!wm2000_i2c) { |
@@ -712,12 +712,12 @@ int wm2000_add_controls(struct snd_soc_codec *codec) | |||
712 | return -ENODEV; | 712 | return -ENODEV; |
713 | } | 713 | } |
714 | 714 | ||
715 | ret = snd_soc_dapm_new_controls(codec, wm2000_dapm_widgets, | 715 | ret = snd_soc_dapm_new_controls(dapm, wm2000_dapm_widgets, |
716 | ARRAY_SIZE(wm2000_dapm_widgets)); | 716 | ARRAY_SIZE(wm2000_dapm_widgets)); |
717 | if (ret < 0) | 717 | if (ret < 0) |
718 | return ret; | 718 | return ret; |
719 | 719 | ||
720 | ret = snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 720 | ret = snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); |
721 | if (ret < 0) | 721 | if (ret < 0) |
722 | return ret; | 722 | return ret; |
723 | 723 | ||