---

yaml --- r: 283723 b: refs/heads/master c: 6662ff5 h: refs/heads/master i: 283721: a292751 283719: af418d7 v: v3
git-mirror · Nov 14, 2011 · 87bb7e4 · 87bb7e4
1 parent 15b6f2c
commit 87bb7e4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fb5eac50d66cab4a41177269432ffffcc3e67ac
+refs/heads/master: 6662ff5c3b8efe8c107118d9506ad65daf3e3a1b
diff --git a/trunk/sound/soc/codecs/alc5632.c b/trunk/sound/soc/codecs/alc5632.c
@@ -68,8 +68,6 @@ static const u16 alc5632_reg_defaults[] = {
 /* codec private data */
 struct alc5632_priv {
 	enum snd_soc_control_type control_type;
-	void *control_data;
-	struct mutex mutex;
 	u8 id;
 	unsigned int sysclk;
 };
@@ -1071,9 +1069,7 @@ static int alc5632_i2c_probe(struct i2c_client *client,
 	}
 
 	i2c_set_clientdata(client, alc5632);
-	alc5632->control_data = client;
 	alc5632->control_type = SND_SOC_I2C;
-	mutex_init(&alc5632->mutex);
 
 	ret =  snd_soc_register_codec(&client->dev,
 		&soc_codec_device_alc5632, &alc5632_dai, 1);