Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus

Conflicts:
	drivers/md/md.c

- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.

Signed-off-by: NeilBrown <neilb@suse.de>

1 files changed, 2 insertions, 1 deletions

diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c
index e000cdfec1ec..f07a415c753f 100644
--- a/sound/soc/codecs/cx20442.c
+++ b/sound/soc/codecs/cx20442.c
@@ -14,6 +14,7 @@
  */
 
 #include <linux/tty.h>
+#include <linux/slab.h>
 
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -386,7 +387,7 @@ static int cx20442_register(struct cx20442_priv *cx20442)
 
         codec->name = "CX20442";
         codec->owner = THIS_MODULE;
-        codec->private_data = cx20442;
+        snd_soc_codec_set_drvdata(codec, cx20442);
 
         codec->dai = &cx20442_dai;
         codec->num_dai = 1;