aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-24 11:24:09 +0100
committerMark Brown <broonie@linaro.org>2013-10-24 11:24:09 +0100
commit10abe843d5f08793fb684eaef3739f3c26635e42 (patch)
tree1d1eec1a55f780f3170a3f04515d4629934766d8 /include/sound
parentMerge remote-tracking branch 'asoc/topic/mc13783' into asoc-next (diff)
parentASoC: mxs-saif: Handle errors in trigger function (diff)
downloadlinux-dev-10abe843d5f08793fb684eaef3739f3c26635e42.tar.xz
linux-dev-10abe843d5f08793fb684eaef3739f3c26635e42.zip
Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc-dai.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index b0ee6590b8ba..800c101bb096 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -169,6 +169,13 @@ struct snd_soc_dai_ops {
struct snd_soc_dai *);
int (*prepare)(struct snd_pcm_substream *,
struct snd_soc_dai *);
+ /*
+ * NOTE: Commands passed to the trigger function are not necessarily
+ * compatible with the current state of the dai. For example this
+ * sequence of commands is possible: START STOP STOP.
+ * So do not unconditionally use refcounting functions in the trigger
+ * function, e.g. clk_enable/disable.
+ */
int (*trigger)(struct snd_pcm_substream *, int,
struct snd_soc_dai *);
int (*bespoke_trigger)(struct snd_pcm_substream *, int,