summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-13 00:20:36 +0100
committerMark Brown <broonie@linaro.org>2013-08-13 10:19:59 +0100
commit69c2d346e8fa8dbed122e82f727332f35718ab86 (patch)
treeecd4982ca6a035a86e72c1fdcd6601bb1e87e93c /sound/soc
parent946d92a100f6c36b1c53922d5105b3c19a59173d (diff)
downloadop-kernel-dev-69c2d346e8fa8dbed122e82f727332f35718ab86.zip
op-kernel-dev-69c2d346e8fa8dbed122e82f727332f35718ab86.tar.gz
ASoC: dapm: Ensure kcontrol list is initialised
Ensure that the recently added path kcontrol list is initialised otherwise we may crash trying to delete routes that don't have kcontrols. Signed-off-by: Mark Brown <broonie@linaro.org> Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-dapm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index b885a9b..d84bd0f 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2354,6 +2354,7 @@ static int snd_soc_dapm_add_path(struct snd_soc_dapm_context *dapm,
path->sink = wsink;
path->connected = connected;
INIT_LIST_HEAD(&path->list);
+ INIT_LIST_HEAD(&path->list_kcontrol);
INIT_LIST_HEAD(&path->list_source);
INIT_LIST_HEAD(&path->list_sink);
OpenPOWER on IntegriCloud