Skip to contentSkip to conversation

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

PATCH Applied Jean-Francois Moine 2 participants 2 messages Jan 3, 2014 – Jan 7, 2014

Subsystems (2)
Sound ASoC
lore
Share & tools
lore

Jean-Francois Moine

author
#0 lore raw

PATCH 1/1 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(-)
sound/soc/soc-pcm.c +1 -1
index 891b9a9..df79101 100644
@@ -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;
Signature · 2 lines
Ken ar c'hentañ	|	      ** Breizh ha Linux atav! **
Jef		|		http://moinejf.free.fr/
maintainer Applied
#1 lore raw
Quoted 2 lines · Jean-Francois Moine

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

Applied, thanks.