diff options
| author | Michael Trimarchi <michael@panicking.kicks-ass.org> | 2009-02-02 10:16:52 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-02-02 10:16:52 +0000 |
| commit | 18148f5d08d35bd136644c81e1083085b98317c8 (patch) | |
| tree | a6e3737eba9183a6487bdff831c8db5ecdb66b09 /sound | |
| parent | 7f859d161097631a3c76ed1dbb1cfcb08ebe9759 (diff) | |
This is a ugly openmokoo revert for name changing in alsa.conf.
Please revert in feuture version
Pointed-out-by: Andy Green <andy@openmoko.com>
Signed-off-by: Michael Trimarchi <michael@panicking.kicks-ass.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-dapm.c | 8 |
1 files changed, 8 insertions, 0 deletions
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, |