summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-08-27 15:50:54 +0200
committerMark Brown <broonie@linaro.org>2013-08-27 15:32:49 +0100
commit34742cb02bd368c1af3349c041d3e4446f7ac6ef (patch)
treea1772d8a211c9cdee81f600ac836849f06bf1b98 /sound/soc
parent69c2d346e8fa8dbed122e82f727332f35718ab86 (diff)
downloadlinux-34742cb02bd368c1af3349c041d3e4446f7ac6ef.tar.gz
linux-34742cb02bd368c1af3349c041d3e4446f7ac6ef.tar.bz2
linux-34742cb02bd368c1af3349c041d3e4446f7ac6ef.zip
ASoC: dapm: Fix marking widgets dirty when a route is added
The current calls to dapm_mark_dirty() in snd_soc_dapm_add_path() are on a path that is only reached if the sink widget is either a mixer or a mux. Move the calls further up so they are called for all widget types. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-dapm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index d84bd0f167b6..7e9afbc49ef2 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2374,6 +2374,9 @@ static int snd_soc_dapm_add_path(struct snd_soc_dapm_context *dapm,
wsource->ext = 1;
}
+ dapm_mark_dirty(wsource, "Route added");
+ dapm_mark_dirty(wsink, "Route added");
+
/* connect static paths */
if (control == NULL) {
list_add(&path->list, &dapm->card->paths);
@@ -2436,9 +2439,6 @@ static int snd_soc_dapm_add_path(struct snd_soc_dapm_context *dapm,
return 0;
}
- dapm_mark_dirty(wsource, "Route added");
- dapm_mark_dirty(wsink, "Route added");
-
return 0;
err:
kfree(path);