Skip to content

Commit

Permalink
Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next
Browse files Browse the repository at this point in the history
  • Loading branch information
broonie committed May 21, 2014
2 parents e3ac3f2 + 4792b0d commit b79e16c
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions sound/soc/soc-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit b79e16c

Please sign in to comment.