From 5acf41b801de60c4d8200f603edf2c0e4d7a6acc Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 18 Aug 2011 15:31:04 +0800 Subject: [PATCH] --- yaml --- r: 270529 b: refs/heads/master c: e3d73c1bbf08b9abd3f56293796ba7b5c15008f5 h: refs/heads/master i: 270527: e556bc56043b92ccaf9e1ba97b4be65abc32481a v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/sta32x.c | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index e37c5098992b..3da69e890b8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f612933021ca6cc0edc2722f5a829d3c5b0a6b5 +refs/heads/master: e3d73c1bbf08b9abd3f56293796ba7b5c15008f5 diff --git a/trunk/sound/soc/codecs/sta32x.c b/trunk/sound/soc/codecs/sta32x.c index 3d155f526672..5c7def3979c0 100644 --- a/trunk/sound/soc/codecs/sta32x.c +++ b/trunk/sound/soc/codecs/sta32x.c @@ -812,6 +812,7 @@ static int sta32x_remove(struct snd_soc_codec *codec) { struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec); + sta32x_set_bias_level(codec, SND_SOC_BIAS_OFF); regulator_bulk_disable(ARRAY_SIZE(sta32x->supplies), sta32x->supplies); regulator_bulk_free(ARRAY_SIZE(sta32x->supplies), sta32x->supplies); @@ -871,18 +872,8 @@ static __devinit int sta32x_i2c_probe(struct i2c_client *i2c, static __devexit int sta32x_i2c_remove(struct i2c_client *client) { struct sta32x_priv *sta32x = i2c_get_clientdata(client); - struct snd_soc_codec *codec = sta32x->codec; - - if (codec) - sta32x_set_bias_level(codec, SND_SOC_BIAS_OFF); - - regulator_bulk_free(ARRAY_SIZE(sta32x->supplies), sta32x->supplies); - - if (codec) { - snd_soc_unregister_codec(&client->dev); - snd_soc_codec_set_drvdata(codec, NULL); - } + snd_soc_unregister_codec(&client->dev); kfree(sta32x); return 0; }