diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-02 11:01:55 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-02 11:01:55 +0100 |
| commit | ea78484bd508d582f543ff727c9a53a381c15895 (patch) | |
| tree | 4c5499468a4276d88fc0976be2f23a3ba72b5694 /sound/soc/codecs/wm8960.c | |
| parent | e03fa055bc126e536c7f65862e08a9b143138ea9 (diff) | |
| parent | 776065e36de1d5eb9e33ff908352fef4050ab38d (diff) | |
Merge branch 'fix/asoc' into for-linus
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 21986c42272..ff6ff2f529d 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -1013,6 +1013,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, |