diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2013-08-27 09:50:54 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-27 10:32:49 -0400 |
commit | 34742cb02bd368c1af3349c041d3e4446f7ac6ef (patch) | |
tree | a1772d8a211c9cdee81f600ac836849f06bf1b98 | |
parent | 69c2d346e8fa8dbed122e82f727332f35718ab86 (diff) |
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>
-rw-r--r-- | sound/soc/soc-dapm.c | 6 |
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, | |||
2374 | wsource->ext = 1; | 2374 | wsource->ext = 1; |
2375 | } | 2375 | } |
2376 | 2376 | ||
2377 | dapm_mark_dirty(wsource, "Route added"); | ||
2378 | dapm_mark_dirty(wsink, "Route added"); | ||
2379 | |||
2377 | /* connect static paths */ | 2380 | /* connect static paths */ |
2378 | if (control == NULL) { | 2381 | if (control == NULL) { |
2379 | list_add(&path->list, &dapm->card->paths); | 2382 | list_add(&path->list, &dapm->card->paths); |
@@ -2436,9 +2439,6 @@ static int snd_soc_dapm_add_path(struct snd_soc_dapm_context *dapm, | |||
2436 | return 0; | 2439 | return 0; |
2437 | } | 2440 | } |
2438 | 2441 | ||
2439 | dapm_mark_dirty(wsource, "Route added"); | ||
2440 | dapm_mark_dirty(wsink, "Route added"); | ||
2441 | |||
2442 | return 0; | 2442 | return 0; |
2443 | err: | 2443 | err: |
2444 | kfree(path); | 2444 | kfree(path); |