From: Gary Zhang <b13634@freescale.com>
Date: Tue, 11 Dec 2012 04:42:42 +0000 (+0800)
Subject: ENGR00236020-1 ALSA: add calling of trigger in machine driver
X-Git-Tag: v3.0.35-fsl~197
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=21b31d8607c5e2641900e489495f6a7ed17f284d;p=karo-tx-linux.git

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>
---

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;
 }