Merge branch 'for-2.6.37' into for-2.6.38
This commit is contained in:
@@ -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,
|
||||
|
Reference in New Issue
Block a user