]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: Fix double addition of prefixes due to widget prefixing
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 9 Mar 2011 11:33:09 +0000 (11:33 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 9 Mar 2011 12:36:14 +0000 (12:36 +0000)
commit95715b00ea0745df6b06c66990a0a3f941cccf48
tree17c33ba548a997b23d2360b0aea948662868e98e
parent4ccdb512d0c33923be6f1efbabaf66a9feb408a3
ASoC: Fix double addition of prefixes due to widget prefixing

We're not only prefixing all controls, we're also prefixing the widget
names in the runtime data. This causes us to add the prefix twice - once
when using the widget name to generate the control name and once when
adding the control.

Really we shouldn't be prefixing the widget names at all, the matching
code should be handing this as we always know which DAPM context a
widget came from and always display the widget name in terms of a DAPM
context.  However, we're quite close to the merge window and that's
relatively invasive.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Reported-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
sound/soc/soc-dapm.c