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/wm8971.c | |
| parent | 839d271c509b6ce5c1da8a8e89fad73a1af0ddda (diff) | |
| parent | 776065e36de1d5eb9e33ff908352fef4050ab38d (diff) | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/codecs/wm8971.c')
| -rw-r--r-- | sound/soc/codecs/wm8971.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c index 8805636bda53..572bb80627a4 100644 --- a/sound/soc/codecs/wm8971.c +++ b/sound/soc/codecs/wm8971.c | |||
| @@ -720,6 +720,7 @@ static __devinit int wm8971_i2c_probe(struct i2c_client *i2c, | |||
| 720 | if (wm8971 == NULL) | 720 | if (wm8971 == NULL) |
| 721 | return -ENOMEM; | 721 | return -ENOMEM; |
| 722 | 722 | ||
| 723 | wm8971->control_type = SND_SOC_I2C; | ||
| 723 | i2c_set_clientdata(i2c, wm8971); | 724 | i2c_set_clientdata(i2c, wm8971); |
| 724 | 725 | ||
| 725 | ret = snd_soc_register_codec(&i2c->dev, | 726 | ret = snd_soc_register_codec(&i2c->dev, |