3 files changed, 11 insertions, 12 deletions

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index f33dda8023ec..cb63df6e46eb 100644
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -68,6 +68,15 @@ int snd_soc_component_stream_event(struct snd_soc_component *component,
         return 0;
 }
 
+int snd_soc_component_set_bias_level(struct snd_soc_component *component,
+                                     enum snd_soc_bias_level level)
+{
+        if (component->driver->set_bias_level)
+                return component->driver->set_bias_level(component, level);
+
+        return 0;
+}
+
 int snd_soc_component_enable_pin(struct snd_soc_component *component,
                                  const char *pin)
 {
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 8cfbe5fb5921..0f75dac4bb26 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2646,14 +2646,6 @@ int snd_soc_register_dai(struct snd_soc_component *component,
 }
 EXPORT_SYMBOL_GPL(snd_soc_register_dai);
 
-static int snd_soc_component_set_bias_level(struct snd_soc_dapm_context *dapm,
-                                        enum snd_soc_bias_level level)
-{
-        struct snd_soc_component *component = dapm->component;
-
-        return component->driver->set_bias_level(component, level);
-}
-
 static int snd_soc_component_initialize(struct snd_soc_component *component,
         const struct snd_soc_component_driver *driver, struct device *dev)
 {
@@ -2674,8 +2666,6 @@ static int snd_soc_component_initialize(struct snd_soc_component *component,
         dapm->bias_level = SND_SOC_BIAS_OFF;
         dapm->idle_bias_off = !driver->idle_bias_on;
         dapm->suspend_bias_off = driver->suspend_bias_off;
-        if (driver->set_bias_level)
-                dapm->set_bias_level = snd_soc_component_set_bias_level;
 
         INIT_LIST_HEAD(&component->dai_list);
         mutex_init(&component->io_mutex);
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 9288b2b43f98..d09bdca63c62 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -684,8 +684,8 @@ int snd_soc_dapm_force_bias_level(struct snd_soc_dapm_context *dapm,
 {
         int ret = 0;
 
-        if (dapm->set_bias_level)
-                ret = dapm->set_bias_level(dapm, level);
+        if (dapm->component)
+                ret = snd_soc_component_set_bias_level(dapm->component, level);
 
         if (ret == 0)
                 dapm->bias_level = level;