]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ASoC: pcm: Fix lack of platform bespoke_trigger() call
authorJean-Francois Moine <moinejf@free.fr>
Fri, 3 Jan 2014 08:19:18 +0000 (09:19 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 7 Jan 2014 17:11:07 +0000 (17:11 +0000)
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>
sound/soc/soc-pcm.c

index feb0f2843026cb9075befa4d7fe549d13f224ce7..d70eecd9e1683af1d9f69ebdb52a44efb9b1fe1b 100644 (file)
@@ -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;