Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32a96d55 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: rsnd: fixup rsnd_dai_call() behavior for unimplemented method 



Current rsnd_dai_call didn't count callback-count if callback
wasn't implemented. Thus, it counts can be unbalance.
ex) .start : implemented
    .stop  : not implemented
This patch solve this issue

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1355720a

sound/soc/sh/rcar/core.c

+2 −7
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io) 
/*

 *	rsnd_dai functions

 */

#define __rsnd_mod_call(mod, io, func, param...)		\

#define rsnd_mod_call(mod, io, func, param...)			\

({								\

	struct rsnd_priv *priv = rsnd_mod_to_priv(mod);		\

	struct device *dev = rsnd_priv_to_dev(priv);		\
@@ -308,7 +308,7 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io) 
	u8 val  = (mod->status >> __rsnd_mod_shift_##func) & 0xF;	\

	u8 add  = ((val + __rsnd_mod_add_##func) & 0xF);		\

	int ret = 0;							\

	int call = (val == __rsnd_mod_call_##func);			\

	int call = (val == __rsnd_mod_call_##func) && (mod)->ops->func;	\

	mod->status = (mod->status & ~mask) +				\

		(add << __rsnd_mod_shift_##func);			\

	dev_dbg(dev, "%s[%d]\t0x%08x %s\n",				\
@@ -319,11 +319,6 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io) 
	ret;								\

})



#define rsnd_mod_call(mod, io, func, param...)	\

	(!(mod) ? -ENODEV :			\

	 !((mod)->ops->func) ? 0 :		\

	 __rsnd_mod_call(mod, io, func, param))



#define rsnd_dai_call(fn, io, param...)				\

({								\

	struct rsnd_mod *mod;					\