diff options
| author | Gary Zhang <b13634@freescale.com> | 2012-12-11 12:42:42 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-12-12 19:12:20 +0800 |
| commit | 3fd920ffdeb61251de9e7b219e18f6dabcd958f8 (patch) | |
| tree | 9a1208959717516a0f675e7e6e073bed42f2dc97 | |
| parent | 240f63568dc64824c6d619d51eaedf64da66e874 (diff) | |
ENGR00236020-1 ALSA: add calling of trigger in machine driver
soc_pcm_trigger() calls trigger functions of cpu_dai, codec_dai
and platform, but the trigger function of machine is not called.
add calling of trigger in machine driver in soc_pcm_trigger()
Signed-off-by: Gary Zhang <b13634@freescale.com>
| -rw-r--r-- | sound/soc/soc-core.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index ad12a4c17b72..e62ad5ffce66 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -5,6 +5,7 @@ * Copyright 2005 Openedhand Ltd. * Copyright (C) 2010 Slimlogic Ltd. * Copyright (C) 2010 Texas Instruments Inc. + * Copyright (C) 2012 Freescale Semiconductor, Inc. * * Author: Liam Girdwood <lrg@slimlogic.co.uk> * with code, comments and ideas from :- @@ -986,6 +987,12 @@ 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; } |