From 18148f5d08d35bd136644c81e1083085b98317c8 Mon Sep 17 00:00:00 2001 From: Michael Trimarchi Date: Mon, 2 Feb 2009 10:16:52 +0000 Subject: This is a ugly openmokoo revert for name changing in alsa.conf. Please revert in feuture version Pointed-out-by: Andy Green Signed-off-by: Michael Trimarchi --- sound/soc/soc-dapm.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'sound') diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index f9e95a7d87a..6df9aa5a083 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -332,6 +332,14 @@ static int dapm_new_mixer(struct snd_soc_codec *codec, snprintf(path->long_name, name_len, "%s %s", w->name, w->kcontrols[i].name); + + /* this is a ugly openmoko revert for name + changing in alsa configuration file. This is mergeable + with the future linux version. Remember to revert XXX + We need it for compatability with previous state files. + */ + name_len = (name_len > 32) ? 32 : name_len; + path->long_name[name_len - 1] = '\0'; path->kcontrol = snd_soc_cnew(&w->kcontrols[i], w, -- cgit v1.2.3