summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 14:07:58 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 14:07:58 +0000
commita36b32402a805033beed752ea85c5ed62586fe35 (patch)
tree10cfb5c2f9f16cd9c8c9c8d49cad4186f0d65bd2 /include/sound
parent23af7b0bba404325755d35bfff64307fa23071e1 (diff)
parent7f08a89862b96d84c6dfe6c242eb010084e51d3b (diff)
downloadlinux-a36b32402a805033beed752ea85c5ed62586fe35.tar.gz
linux-a36b32402a805033beed752ea85c5ed62586fe35.tar.bz2
linux-a36b32402a805033beed752ea85c5ed62586fe35.zip
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-next
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc-dapm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index e1ef63d4a5c4..44a30b108683 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -488,6 +488,7 @@ struct snd_soc_dapm_path {
/* status */
u32 connect:1; /* source and sink widgets are connected */
u32 walked:1; /* path has been walked */
+ u32 walking:1; /* path is in the process of being walked */
u32 weak:1; /* path ignored for power management */
int (*connected)(struct snd_soc_dapm_widget *source,