From 21b31d8607c5e2641900e489495f6a7ed17f284d Mon Sep 17 00:00:00 2001 From: Gary Zhang Date: Tue, 11 Dec 2012 12:42:42 +0800 Subject: [PATCH] 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 --- sound/soc/soc-core.c | 7 +++++++ 1 file changed, 7 insertions(+) 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 * 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; } -- 2.39.5