ASoC: sn95031: Fix control-less DAPM routes
authorLars-Peter Clausen <lars@metafoo.de>
Fri, 27 Feb 2015 13:13:04 +0000 (14:13 +0100)
committerSasha Levin <sasha.levin@oracle.com>
Thu, 9 Apr 2015 22:40:48 +0000 (18:40 -0400)
commitdb17146a0d26211abea0e30dd251e5e99a1e96d4
tree186e2e31ca72c1aa66db899db2303c715554d5b7
parent4ac22da9d867c95890a4c8232a967ae0446cc015
ASoC: sn95031: Fix control-less DAPM routes

[ Upstream commit cdd3d2a93f08823a0b9802147dc28c99029dfdfd ]

Routes without a control must use NULL for the control name. The sn95031
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 sn95031 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: Vinod Koul <vinod.koul@intel.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/sn95031.c