Skip to content

Commit

Permalink
ASoC: dapm: Fix marking widgets dirty when a route is added
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Aug 27, 2013
1 parent 69c2d34 commit 34742cb
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions sound/soc/soc-dapm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 34742cb

Please sign in to comment.