diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 13:56:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 13:56:58 +0100 |
| commit | 56c32c751cdf4aee810b4ad537ab1d836ee8f516 (patch) | |
| tree | d9a53471e7ce903d7b5eb7460f1aad7f3179bf9d /sound/soc/soc-dapm.c | |
| parent | 54b019cbd993bb9d432a27a51a800f4981aa2f1c (diff) | |
| parent | 379cf39781fdb34c75bab6ac54707bc4466f3dc4 (diff) | |
| download | linux-3.10-56c32c751cdf4aee810b4ad537ab1d836ee8f516.tar.gz linux-3.10-56c32c751cdf4aee810b4ad537ab1d836ee8f516.tar.bz2 linux-3.10-56c32c751cdf4aee810b4ad537ab1d836ee8f516.zip | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index d6d9ba2e691..33acd8b892d 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3137,7 +3137,6 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, break; } - dapm->n_widgets++; w->dapm = dapm; w->codec = dapm->codec; w->platform = dapm->platform; |