1 files changed, 16 insertions, 12 deletions

diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c
index 1332692ef81..00121ba3659 100644
--- a/sound/soc/codecs/wm8958-dsp2.c
+++ b/sound/soc/codecs/wm8958-dsp2.c
@@ -946,7 +946,7 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                 wm8994->mbc_texts = kmalloc(sizeof(char *)
                                             * pdata->num_mbc_cfgs, GFP_KERNEL);
                 if (!wm8994->mbc_texts) {
-                        dev_err(wm8994->codec->dev,
+                        dev_err(wm8994->hubs.codec->dev,
                                 "Failed to allocate %d MBC config texts\n",
                                 pdata->num_mbc_cfgs);
                         return;
@@ -958,9 +958,10 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                 wm8994->mbc_enum.max = pdata->num_mbc_cfgs;
                 wm8994->mbc_enum.texts = wm8994->mbc_texts;
 
-                ret = snd_soc_add_codec_controls(wm8994->codec, control, 1);
+                ret = snd_soc_add_codec_controls(wm8994->hubs.codec,
+                                                 control, 1);
                 if (ret != 0)
-                        dev_err(wm8994->codec->dev,
+                        dev_err(wm8994->hubs.codec->dev,
                                 "Failed to add MBC mode controls: %d\n", ret);
         }
 
@@ -974,7 +975,7 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                 wm8994->vss_texts = kmalloc(sizeof(char *)
                                             * pdata->num_vss_cfgs, GFP_KERNEL);
                 if (!wm8994->vss_texts) {
-                        dev_err(wm8994->codec->dev,
+                        dev_err(wm8994->hubs.codec->dev,
                                 "Failed to allocate %d VSS config texts\n",
                                 pdata->num_vss_cfgs);
                         return;
@@ -986,9 +987,10 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                 wm8994->vss_enum.max = pdata->num_vss_cfgs;
                 wm8994->vss_enum.texts = wm8994->vss_texts;
 
-                ret = snd_soc_add_codec_controls(wm8994->codec, control, 1);
+                ret = snd_soc_add_codec_controls(wm8994->hubs.codec,
+                                                 control, 1);
                 if (ret != 0)
-                        dev_err(wm8994->codec->dev,
+                        dev_err(wm8994->hubs.codec->dev,
                                 "Failed to add VSS mode controls: %d\n", ret);
         }
 
@@ -1003,7 +1005,7 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                 wm8994->vss_hpf_texts = kmalloc(sizeof(char *)
                                                 * pdata->num_vss_hpf_cfgs, GFP_KERNEL);
                 if (!wm8994->vss_hpf_texts) {
-                        dev_err(wm8994->codec->dev,
+                        dev_err(wm8994->hubs.codec->dev,
                                 "Failed to allocate %d VSS HPF config texts\n",
                                 pdata->num_vss_hpf_cfgs);
                         return;
@@ -1015,9 +1017,10 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                 wm8994->vss_hpf_enum.max = pdata->num_vss_hpf_cfgs;
                 wm8994->vss_hpf_enum.texts = wm8994->vss_hpf_texts;
 
-                ret = snd_soc_add_codec_controls(wm8994->codec, control, 1);
+                ret = snd_soc_add_codec_controls(wm8994->hubs.codec,
+                                                 control, 1);
                 if (ret != 0)
-                        dev_err(wm8994->codec->dev,
+                        dev_err(wm8994->hubs.codec->dev,
                                 "Failed to add VSS HPFmode controls: %d\n",
                                 ret);
         }
@@ -1033,7 +1036,7 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                 wm8994->enh_eq_texts = kmalloc(sizeof(char *)
                                                 * pdata->num_enh_eq_cfgs, GFP_KERNEL);
                 if (!wm8994->enh_eq_texts) {
-                        dev_err(wm8994->codec->dev,
+                        dev_err(wm8994->hubs.codec->dev,
                                 "Failed to allocate %d enhanced EQ config texts\n",
                                 pdata->num_enh_eq_cfgs);
                         return;
@@ -1045,9 +1048,10 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                 wm8994->enh_eq_enum.max = pdata->num_enh_eq_cfgs;
                 wm8994->enh_eq_enum.texts = wm8994->enh_eq_texts;
 
-                ret = snd_soc_add_codec_controls(wm8994->codec, control, 1);
+                ret = snd_soc_add_codec_controls(wm8994->hubs.codec,
+                                                 control, 1);
                 if (ret != 0)
-                        dev_err(wm8994->codec->dev,
+                        dev_err(wm8994->hubs.codec->dev,
                                 "Failed to add enhanced EQ controls: %d\n",
                                 ret);
         }