]> git.ipfire.org Git - thirdparty/kernel/stable.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)
committerSasha Levin <sasha.levin@oracle.com>
Thu, 9 Apr 2015 22:40:32 +0000 (18:40 -0400)
commitcab451cce5bf5946f7483e8233b4ba7785e9aece
tree2b86abd957e3b1d22e97540dafafd32b6bbe1c31
parentf154a14e3efa547025d014d0a3f29396f03b1f74
ASoC: da732x: Fix control-less DAPM routes

[ Upstream commit 8e6a75c102f8e232b599a06e06731d8c5d5f2c5d ]

Routes without a control must use NULL for the control name. The da732x
driver uses "NULL" instead in a few places. Previous to commit 5fe5b767dc6f
("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: 5fe5b767dc6f ("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
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
sound/soc/codecs/da732x.c