diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-05 08:22:08 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-05 08:22:10 -0500 |
| commit | aef1b9cef78ae65c6501850851cc3f61f9be477b (patch) | |
| tree | 9769972983e84620df17c13b73f70a8341c4b125 /sound/soc/codecs/wm8940.c | |
| parent | 20c457b8587bee4644d998331d9e13be82e05b4c (diff) | |
| parent | 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 (diff) | |
Merge commit 'v2.6.37' into perf/core
Merge reason: Add the final .37 tree.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/soc/codecs/wm8940.c')
| -rw-r--r-- | sound/soc/codecs/wm8940.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index 2cb16f895c46..23086e2c976a 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c | |||
| @@ -768,6 +768,7 @@ static __devinit int wm8940_i2c_probe(struct i2c_client *i2c, | |||
| 768 | 768 | ||
| 769 | i2c_set_clientdata(i2c, wm8940); | 769 | i2c_set_clientdata(i2c, wm8940); |
| 770 | wm8940->control_data = i2c; | 770 | wm8940->control_data = i2c; |
| 771 | wm8940->control_type = SND_SOC_I2C; | ||
| 771 | 772 | ||
| 772 | ret = snd_soc_register_codec(&i2c->dev, | 773 | ret = snd_soc_register_codec(&i2c->dev, |
| 773 | &soc_codec_dev_wm8940, &wm8940_dai, 1); | 774 | &soc_codec_dev_wm8940, &wm8940_dai, 1); |