diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-18 15:05:25 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-18 15:05:25 +0100 |
commit | 5d5940d4690d5cd0321256902b2aea8d4c554416 (patch) | |
tree | bd39a4ef6eaba9b80bcdf37c867b9e23c468480d /sound/soc/soc-dapm.c | |
parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) | |
parent | 60b6f1a1e578a5f8a245d4b7622ebf2bad7798cb (diff) |
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; |