Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / soc-dapm.c

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index a8e842e02cdc2435626bfa71b4c4f124ababa42e..b05231414c1d0f6d8e8be7ee8bacdf2c4f70fa56 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -370,14 +370,14 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
        case snd_soc_dapm_mixer_named_ctl:
                mc = (struct soc_mixer_control *)kcontrol->private_value;
 
-               if (mc->autodisable && snd_soc_volsw_is_stereo(mc))
-                       dev_warn(widget->dapm->dev,
-                                "ASoC: Unsupported stereo autodisable control '%s'\n",
-                                ctrl_name);
-
                if (mc->autodisable) {
                        struct snd_soc_dapm_widget template;
 
+                       if (snd_soc_volsw_is_stereo(mc))
+                               dev_warn(widget->dapm->dev,
+                                        "ASoC: Unsupported stereo autodisable control '%s'\n",
+                                        ctrl_name);
+
                        name = kasprintf(GFP_KERNEL, "%s %s", ctrl_name,
                                         "Autodisable");
                        if (!name) {