git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.37' into for-2.6.38
[pandora-kernel.git]
/
sound
/
soc
/
codecs
/
wm8960.c
diff --git
a/sound/soc/codecs/wm8960.c
b/sound/soc/codecs/wm8960.c
index
2bb8561
..
4393394
100644
(file)
--- a/
sound/soc/codecs/wm8960.c
+++ b/
sound/soc/codecs/wm8960.c
@@
-1014,6
+1014,7
@@
static __devinit int wm8960_i2c_probe(struct i2c_client *i2c,
return -ENOMEM;
i2c_set_clientdata(i2c, wm8960);
+ wm8960->control_type = SND_SOC_I2C;
wm8960->control_data = i2c;
ret = snd_soc_register_codec(&i2c->dev,