1 files changed, 4 insertions, 2 deletions

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 20dcc978588..5720dbcefbc 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2077,7 +2077,7 @@ unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg)
 {
         unsigned int ret;
 
-        ret = codec->driver->read(codec, reg);
+        ret = codec->read(codec, reg);
         dev_dbg(codec->dev, "read %x => %x\n", reg, ret);
         trace_snd_soc_reg_read(codec, reg, ret);
 
@@ -2090,7 +2090,7 @@ unsigned int snd_soc_write(struct snd_soc_codec *codec,
 {
         dev_dbg(codec->dev, "write %x = %x\n", reg, val);
         trace_snd_soc_reg_write(codec, reg, val);
-        return codec->driver->write(codec, reg, val);
+        return codec->write(codec, reg, val);
 }
 EXPORT_SYMBOL_GPL(snd_soc_write);
 
@@ -3448,6 +3448,8 @@ int snd_soc_register_codec(struct device *dev,
 
         INIT_LIST_HEAD(&codec->dapm.widgets);
         INIT_LIST_HEAD(&codec->dapm.paths);
+        codec->write = codec_drv->write;
+        codec->read = codec_drv->read;
         codec->dapm.bias_level = SND_SOC_BIAS_OFF;
         codec->dapm.dev = dev;
         codec->dapm.codec = codec;