summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-23 19:25:18 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-23 19:25:18 +0100
commit83097a9c677101645665ac7222e06ebd03a9e997 (patch)
tree7e4eb8a7a19607c28ff75a35fb2bdec42121bb55 /sound/soc/soc-dapm.c
parent60d509fa6a9c4653a86ad830e4c4b30360b23f0e (diff)
parent60b6f1a1e578a5f8a245d4b7622ebf2bad7798cb (diff)
downloadop-kernel-dev-83097a9c677101645665ac7222e06ebd03a9e997.zip
op-kernel-dev-83097a9c677101645665ac7222e06ebd03a9e997.tar.gz
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.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index d6d9ba2..33acd8b 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;
OpenPOWER on IntegriCloud