1 files changed, 2 insertions, 11 deletions

diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
index 3d155f526672..5c7def3979c0 100644
--- a/sound/soc/codecs/sta32x.c
+++ b/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;
 }