Merge branch 'for-3.2' into for-3.3

[deliverable/linux.git] / sound / soc / codecs / stac9766.c

diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c
index 55819537b6776c0f3cc9569c9337cb43a97d86b1..cc0566c22ec12ecfcf3f67d486b6330fea448f47 100644 (file)
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
@@ -256,8 +256,7 @@ static int stac9766_reset(struct snd_soc_codec *codec, int try_warm)
        return 0;
 }
 
-static int stac9766_codec_suspend(struct snd_soc_codec *codec,
-                                 pm_message_t state)
+static int stac9766_codec_suspend(struct snd_soc_codec *codec)
 {
        stac9766_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;
@@ -380,7 +379,7 @@ static struct snd_soc_codec_driver soc_codec_dev_stac9766 = {
        .remove = stac9766_codec_remove,
        .suspend = stac9766_codec_suspend,
        .resume = stac9766_codec_resume,
-       .reg_cache_size = sizeof(stac9766_reg),
+       .reg_cache_size = ARRAY_SIZE(stac9766_reg),
        .reg_word_size = sizeof(u16),
        .reg_cache_step = 2,
        .reg_cache_default = stac9766_reg,