| commit | b79e16cb4a7d8160d3e4eda5f547eba90630b3a8 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Thu May 22 00:23:44 2014 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Thu May 22 00:23:44 2014 +0100 |
| tree | 0a4a326c1c9e9204e388353c9cf72bbc890e5257 | |
| parent | e3ac3f2510e5adb62eb4296d3fd0fac5441b2037 [diff] | |
| parent | 4792b0dbcf3d41a19e76adc9c98c5cc889daa065 [diff] |
Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index d2b950c..903d737 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c
@@ -818,6 +818,13 @@ 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; }