diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-03-27 10:32:29 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-03-27 10:32:29 -0400 |
commit | 50953e0640b3473dcb409d5d0d938c2742c93b0d (patch) | |
tree | 3b0dc374e61564fbbd8adff92c8fae16fdeb423a /sound/soc/codecs/lm4857.c | |
parent | f92c97c8bd77992ff8bd6ef29a23dc82dca799cb (diff) | |
parent | 626cf236608505d376e4799adb4f7eb00a8594af (diff) |
Merge branch 'poll' into staging/for_v3.4
* poll: (5970 commits)
poll: add poll_requested_events() and poll_does_not_wait() functions
crc32: select an algorithm via Kconfig
crc32: add self-test code for crc32c
crypto: crc32c should use library implementation
crc32: bolt on crc32c
crc32: add note about this patchset to crc32.c
crc32: optimize loop counter for x86
crc32: add slice-by-8 algorithm to existing code
crc32: make CRC_*_BITS definition correspond to actual bit counts
crc32: fix mixing of endian-specific types
crc32: miscellaneous cleanups
crc32: simplify unit test code
crc32: move long comment about crc32 fundamentals to Documentation/
crc32: remove two instances of trailing whitespaces
checkpatch: check for quoted strings broken across lines
checkpatch: whitespace - add/remove blank lines
checkpatch: warn on use of yield()
checkpatch: add --strict tests for braces, comments and casts
checkpatch: add [] to type extensions
checkpatch: high precedence operators do not require additional parentheses in #defines
...
Diffstat (limited to 'sound/soc/codecs/lm4857.c')
-rw-r--r-- | sound/soc/codecs/lm4857.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/lm4857.c b/sound/soc/codecs/lm4857.c index 319039240e0..ba4fafb93e5 100644 --- a/sound/soc/codecs/lm4857.c +++ b/sound/soc/codecs/lm4857.c | |||
@@ -179,7 +179,7 @@ static int lm4857_probe(struct snd_soc_codec *codec) | |||
179 | 179 | ||
180 | codec->control_data = lm4857->i2c; | 180 | codec->control_data = lm4857->i2c; |
181 | 181 | ||
182 | ret = snd_soc_add_controls(codec, lm4857_controls, | 182 | ret = snd_soc_add_codec_controls(codec, lm4857_controls, |
183 | ARRAY_SIZE(lm4857_controls)); | 183 | ARRAY_SIZE(lm4857_controls)); |
184 | if (ret) | 184 | if (ret) |
185 | return ret; | 185 | return ret; |