]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: da732x: Fix control-less DAPM routes
authorLars-Peter Clausen <lars@metafoo.de>
Fri, 27 Feb 2015 13:13:03 +0000 (14:13 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 5 Mar 2015 00:58:54 +0000 (00:58 +0000)
commit67ad7ddfbae454d715e325e9fe52241a2f8595b1
treed9fc4ce179cf497f776d0356b68e129c20540414
parentb7d65746744b343701de14ca433982a3229390be
ASoC: da732x: Fix control-less DAPM routes

Routes without a control must use NULL for the control name. The da732x
driver uses "NULL" instead in a few places. Previous to commit 6ba8000c6150
("ASoC: dapm: Do not pretend to support controls for non mixer/mux widgets")
the DAPM core silently ignored non-NULL controls on non-mixer and non-mux
routes. But starting with that commit it will complain and not add the
route breaking the da732x driver in the process.

This patch replaces the incorrect "NULL" control name with NULL to fix the
issue.

Fixes: 6ba8000c6150 ("ASoC: dapm: Do not pretend to support controls for non mixer/mux widgets")
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
sound/soc/codecs/da732x.c