summaryrefslogtreecommitdiff
path: root/sound/soc/soc-pcm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-05-22 00:23:44 +0100
committerMark Brown <broonie@linaro.org>2014-05-22 00:23:44 +0100
commitb79e16cb4a7d8160d3e4eda5f547eba90630b3a8 (patch)
tree0a4a326c1c9e9204e388353c9cf72bbc890e5257 /sound/soc/soc-pcm.c
parente3ac3f2510e5adb62eb4296d3fd0fac5441b2037 (diff)
parent4792b0dbcf3d41a19e76adc9c98c5cc889daa065 (diff)
Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next
Diffstat (limited to 'sound/soc/soc-pcm.c')
-rw-r--r--sound/soc/soc-pcm.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index d2b950c99d88..903d737c352f 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -818,6 +818,13 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
if (ret < 0)
return ret;
}
+
+ if (rtd->dai_link->ops && rtd->dai_link->ops->trigger) {
+ ret = rtd->dai_link->ops->trigger(substream, cmd);
+ if (ret < 0)
+ return ret;
+ }
+
return 0;
}