2014-01-03 08:20:10

by Jean-Francois Moine

[permalink] [raw]
Subject: [PATCH] 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 <[email protected]>
---
sound/soc/soc-pcm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 891b9a9..df79101 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -672,7 +672,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;
--
Ken ar c'hentaƱ | ** Breizh ha Linux atav! **
Jef | http://moinejf.free.fr/


2014-01-07 17:11:41

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] ASoC: pcm: Fix lack of platform bespoke_trigger() call

On Fri, Jan 03, 2014 at 09:19:18AM +0100, Jean-Francois Moine wrote:
> When the platform driver has no ops, the platform function
> bespoke_trigger() is no more called.

Applied, thanks.


Attachments:
(No filename) (187.00 B)
signature.asc (836.00 B)
Digital signature
Download all attachments