aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/soc-pcm.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2014-01-03 09:19:18 +0100
committerMark Brown <broonie@linaro.org>2014-01-07 17:11:07 +0000
commitdcf0fa27a56025793a700e81edd261ee3369e294 (patch)
treeb0a89e76e8a308ac9ef8efe27ec767d97c0b4a39 /sound/soc/soc-pcm.c
parent002220a90db8ab9a6313887934dec25b54404cbd (diff)
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>
Diffstat (limited to 'sound/soc/soc-pcm.c')
-rw-r--r--sound/soc/soc-pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index feb0f284302..d70eecd9e16 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;