diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-28 18:42:53 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-28 18:42:53 -0500 |
commit | 22a756ee8951e597c76e5a60f81d40a43054489e (patch) | |
tree | 10415d740b2876dc13ac7b0f857a7717987b9ddf /sound/soc/codecs/wm8960.c | |
parent | 839d271c509b6ce5c1da8a8e89fad73a1af0ddda (diff) | |
parent | 776065e36de1d5eb9e33ff908352fef4050ab38d (diff) |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/codecs/wm8960.c')
-rw-r--r-- | sound/soc/codecs/wm8960.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 2bb856156eda..4393394b7bc1 100644 --- 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, | |||
1014 | return -ENOMEM; | 1014 | return -ENOMEM; |
1015 | 1015 | ||
1016 | i2c_set_clientdata(i2c, wm8960); | 1016 | i2c_set_clientdata(i2c, wm8960); |
1017 | wm8960->control_type = SND_SOC_I2C; | ||
1017 | wm8960->control_data = i2c; | 1018 | wm8960->control_data = i2c; |
1018 | 1019 | ||
1019 | ret = snd_soc_register_codec(&i2c->dev, | 1020 | ret = snd_soc_register_codec(&i2c->dev, |