25 Jul
2019
25 Jul
'19
9:59 p.m.
On 2019-07-24 03:51, Kuninori Morimoto wrote:> +
+int snd_soc_component_prepare(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
+{
- if (component->driver->ops &&
component->driver->ops->prepare)
return component->driver->ops->prepare(substream);
- return 0;
+} diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 86d2e6b..a77a14c 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -774,11 +774,7 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream) for_each_rtdcom(rtd, rtdcom) { component = rtdcom->component;
if (!component->driver->ops ||
!component->driver->ops->prepare)
continue;
ret = component->driver->ops->prepare(substream);
if (ret < 0) { dev_err(component->dev, "ASoC: platform prepare error: %d\n", ret);snd_soc_component_prepare(component, substream);
Compared to old code, ret gets ignored here. Guess unintended modification?