diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 14:07:58 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 14:07:58 +0000 |
| commit | a36b32402a805033beed752ea85c5ed62586fe35 (patch) | |
| tree | 10cfb5c2f9f16cd9c8c9c8d49cad4186f0d65bd2 /sound | |
| parent | 23af7b0bba404325755d35bfff64307fa23071e1 (diff) | |
| parent | 7f08a89862b96d84c6dfe6c242eb010084e51d3b (diff) | |
| download | linux-a36b32402a805033beed752ea85c5ed62586fe35.tar.gz linux-a36b32402a805033beed752ea85c5ed62586fe35.tar.bz2 linux-a36b32402a805033beed752ea85c5ed62586fe35.zip | |
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-dapm.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 1d6a9b3ceb27..d6d9ba2e6916 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -831,6 +831,9 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget, if (path->weak) continue; + if (path->walking) + return 1; + if (path->walked) continue; @@ -838,6 +841,7 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget, if (path->sink && path->connect) { path->walked = 1; + path->walking = 1; /* do we need to add this widget to the list ? */ if (list) { @@ -847,11 +851,14 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget, dev_err(widget->dapm->dev, "ASoC: could not add widget %s\n", widget->name); + path->walking = 0; return con; } } con += is_connected_output_ep(path->sink, list); + + path->walking = 0; } } @@ -931,6 +938,9 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget, if (path->weak) continue; + if (path->walking) + return 1; + if (path->walked) continue; @@ -938,6 +948,7 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget, if (path->source && path->connect) { path->walked = 1; + path->walking = 1; /* do we need to add this widget to the list ? */ if (list) { @@ -947,11 +958,14 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget, dev_err(widget->dapm->dev, "ASoC: could not add widget %s\n", widget->name); + path->walking = 0; return con; } } con += is_connected_input_ep(path->source, list); + + path->walking = 0; } } |