diff options
| author | Mark Brown | 2010-12-29 00:42:53 +0100 |
|---|---|---|
| committer | Mark Brown | 2010-12-29 00:42:53 +0100 |
| commit | 22a756ee8951e597c76e5a60f81d40a43054489e (patch) | |
| tree | 10415d740b2876dc13ac7b0f857a7717987b9ddf /sound/soc/codecs/wm8971.c | |
| parent | ASoC: codecs: Remove unused reg_cache fields from device structs (diff) | |
| parent | ASoC: codecs: wm8753: Fix register cache incoherency (diff) | |
| download | kernel-qcow2-linux-22a756ee8951e597c76e5a60f81d40a43054489e.tar.gz kernel-qcow2-linux-22a756ee8951e597c76e5a60f81d40a43054489e.tar.xz kernel-qcow2-linux-22a756ee8951e597c76e5a60f81d40a43054489e.zip | |
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, if (wm8971 == NULL) return -ENOMEM; + wm8971->control_type = SND_SOC_I2C; i2c_set_clientdata(i2c, wm8971); ret = snd_soc_register_codec(&i2c->dev, |