From: Jean-Francois Moine <moinejf@free.fr>
Date: Fri, 3 Jan 2014 08:19:18 +0000 (+0100)
Subject: ASoC: pcm: Fix lack of platform bespoke_trigger() call
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dcf0fa27a56025793a700e81edd261ee3369e294;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

ASoC: pcm: Fix lack of platform bespoke_trigger() call

When the platform driver has no ops, the platform function
bespoke_trigger() is no more called.

The problem was introduced by the commit c5914b0aaea6494aaa9e415cbd32f8b7eb604af0
	"ASoC: pcm: Check for ops before deferencing them"

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index feb0f2843026..d70eecd9e168 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -769,7 +769,7 @@ static int soc_pcm_bespoke_trigger(struct snd_pcm_substream *substream,
 			return ret;
 	}
 
-	if (platform->driver->ops && platform->driver->bespoke_trigger) {
+	if (platform->driver->bespoke_trigger) {
 		ret = platform->driver->bespoke_trigger(substream, cmd);
 		if (ret < 0)
 			return ret;