aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-08-20 15:26:04 -0400
committerTakashi Iwai <tiwai@suse.de>2012-08-20 15:26:04 -0400
commitf0b433e9f362e0b7f0ce7d1489dd7feba068605d (patch)
treed4bfd9489cf4a96a55d83af20919f477a846d585 /sound/soc/soc-dapm.c
parentfa2f5bf09610d3c216d4c74855edbe00d636467c (diff)
parent28c42c28309244d0b15d1b385e33429d59997679 (diff)
Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Additional updates for 3.6 A batch more bugfixes, all driver-specific and fairly small and unremarkable in a global context. The biggest batch are for the newly added Arizona drivers.
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 4d181df95dc3..dd7c49fafd75 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1572,7 +1572,7 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event)
1572 struct snd_soc_dapm_context *d; 1572 struct snd_soc_dapm_context *d;
1573 LIST_HEAD(up_list); 1573 LIST_HEAD(up_list);
1574 LIST_HEAD(down_list); 1574 LIST_HEAD(down_list);
1575 LIST_HEAD(async_domain); 1575 ASYNC_DOMAIN_EXCLUSIVE(async_domain);
1576 enum snd_soc_bias_level bias; 1576 enum snd_soc_bias_level bias;
1577 1577
1578 trace_snd_soc_dapm_start(card); 1578 trace_snd_soc_dapm_start(card);