Merge branch 'topic/asoc' into for-linus

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

diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c
index 35b8816..75af2d6 100644 (file)
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@ -23,6 +23,7 @@
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -181,7 +182,7 @@ static const u8 da7210_reg[] = {
 static inline u32 da7210_read_reg_cache(struct snd_soc_codec *codec, u32 reg)
 {
        u8 *cache = codec->reg_cache;
-       BUG_ON(reg > ARRAY_SIZE(da7210_reg));
+       BUG_ON(reg >= ARRAY_SIZE(da7210_reg));
        return cache[reg];
 }
 
@@ -460,7 +461,7 @@ static int da7210_init(struct da7210_priv *da7210)
        INIT_LIST_HEAD(&codec->dapm_widgets);
        INIT_LIST_HEAD(&codec->dapm_paths);
 
-       codec->private_data     = da7210;
+       snd_soc_codec_set_drvdata(codec, da7210);
        codec->name             = "DA7210";
        codec->owner            = THIS_MODULE;
        codec->read             = da7210_read;