diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-18 13:22:37 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-18 13:22:37 -0400 |
| commit | cb3f2adc03ab055b19c677a6283523861fafebdd (patch) | |
| tree | 59cfb6800f0635a4aec16c8e0da619f27e51ee79 /sound/soc/codecs/ak4671.c | |
| parent | 44c76a960a62fcc46cbcaa0a22a34e666a729329 (diff) | |
| parent | 828006de1bddf83b6ecf03ec459c15f7c7c22db7 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/ak4671.c')
| -rw-r--r-- | sound/soc/codecs/ak4671.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c index a53b152e6a07..5fb7c2a80e6d 100644 --- a/sound/soc/codecs/ak4671.c +++ b/sound/soc/codecs/ak4671.c | |||
| @@ -628,7 +628,7 @@ static int ak4671_probe(struct snd_soc_codec *codec) | |||
| 628 | return ret; | 628 | return ret; |
| 629 | } | 629 | } |
| 630 | 630 | ||
| 631 | snd_soc_add_controls(codec, ak4671_snd_controls, | 631 | snd_soc_add_codec_controls(codec, ak4671_snd_controls, |
| 632 | ARRAY_SIZE(ak4671_snd_controls)); | 632 | ARRAY_SIZE(ak4671_snd_controls)); |
| 633 | 633 | ||
| 634 | ak4671_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | 634 | ak4671_set_bias_level(codec, SND_SOC_BIAS_STANDBY); |