Skip to contentSkip to conversation

ASoC: codecs: Add missing control_type initialization

PATCH In review Lars-Peter Clausen 2 participants 2 messages Dec 28, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: codecs: Add missing control_type initialization

Some codec drivers do not initialize the control_type field in their private device struct, but still use it when calling snd_soc_codec_set_cache_io. This patch fixes the issue by properly initializing it in the drivers probe functions.

---
Compile tested only

---
 sound/soc/codecs/wm8940.c |    1 +
 sound/soc/codecs/wm8955.c |    1 +
 sound/soc/codecs/wm8960.c |    1 +
 sound/soc/codecs/wm8971.c |    1 +
 sound/soc/codecs/wm9081.c |    1 +
 5 files changed, 5 insertions(+), 0 deletions(-)
sound/soc/codecs/wm8940.c +1 -0
index f8c33b6..a2c788f 100644
@@ -767,6 +767,7 @@ static __devinit int wm8940_i2c_probe(struct i2c_client *i2c,
 
 	i2c_set_clientdata(i2c, wm8940);
 	wm8940->control_data = i2c;
+	wm8940->control_type = SND_SOC_I2C;
 
 	ret = snd_soc_register_codec(&i2c->dev,
 			&soc_codec_dev_wm8940, &wm8940_dai, 1);
sound/soc/codecs/wm8955.c +1 -0
index fdc7c8a..2ac35b0 100644
@@ -1003,6 +1003,7 @@ static __devinit int wm8955_i2c_probe(struct i2c_client *i2c,
 		return -ENOMEM;
 
 	i2c_set_clientdata(i2c, wm8955);
+	wm8955->control_type = SND_SOC_I2C;
 
 	ret = snd_soc_register_codec(&i2c->dev,
 			&soc_codec_dev_wm8955, &wm8955_dai, 1);
sound/soc/codecs/wm8960.c +1 -0
index 6983502..4a99b766 100644
@@ -1012,6 +1012,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,
sound/soc/codecs/wm8971.c +1 -0
index 63f6dbf..9f18db6 100644
@@ -718,6 +718,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,
sound/soc/codecs/wm9081.c +1 -0
index 11018e2..badc8ee 100644
@@ -1334,6 +1334,7 @@ static __devinit int wm9081_i2c_probe(struct i2c_client *i2c,
 		return -ENOMEM;
 
 	i2c_set_clientdata(i2c, wm9081);
+	wm9081->control_type = SND_SOC_I2C;
 	wm9081->control_data = i2c;
 
 	ret = snd_soc_register_codec(&i2c->dev,
Signature · 1 line
1.7.2.3
#1 lore raw
Quoted 4 lines · Lars-Peter Clausen

Some codec drivers do not initialize the control_type field in their private device struct, but still use it when calling snd_soc_codec_set_cache_io. This patch fixes the issue by properly initializing it in the drivers probe functions.

Applied for 2.6.37. Some of the drivers could skip this as the hardware only supports one bus but it doesn't really matter for the fix.