Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next

b79e16cb · Mark Brown · e3ac3f25 · 4792b0db · b79e16cb
Commit b79e16cb authored May 22, 2014 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

sound/soc/soc-pcm.c sound/soc/soc-pcm.c +7 -0

No files found.
--- 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;
 }