Merge branch 'topic/asoc' into for-linus

[safe/jmp/linux-2.6] / sound / soc / codecs / stac9766.c

diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c
index 3293629..ee86568 100644 (file)
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
@@ -289,9 +289,6 @@ reset:
        }
        stac9766_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-       if (codec->suspend_bias_level == SND_SOC_BIAS_ON)
-               stac9766_set_bias_level(codec, SND_SOC_BIAS_ON);
-
        return 0;
 }
 
@@ -410,7 +407,7 @@ reset_err:
 pcm_err:
        snd_soc_free_ac97_codec(codec);
 codec_err:
-       kfree(codec->private_data);
+       kfree(snd_soc_codec_get_drvdata(codec));
 cache_err:
        kfree(socdev->card->codec);
        socdev->card->codec = NULL;