ASoC: Merge up release

[linux-2.6-microblaze.git] / sound / soc / codecs / cs35l56.c

diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c
index 23da9b9..8a0ca08 100644 (file)
--- a/sound/soc/codecs/cs35l56.c
+++ b/sound/soc/codecs/cs35l56.c
@@ -115,7 +115,7 @@ static int cs35l56_sync_asp1_mixer_widgets_with_firmware(struct cs35l56_private
                        name = full_name;
                }
 
-               kcontrol = snd_soc_card_get_kcontrol(dapm->card, name);
+               kcontrol = snd_soc_card_get_kcontrol_locked(dapm->card, name);
                if (!kcontrol) {
                        dev_warn(cs35l56->base.dev, "Could not find control %s\n", name);
                        continue;