Unverified Commit ed67a340 authored by Harshit Mogalapalli's avatar Harshit Mogalapalli Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda-dai: Fix locking in hda_ipc4_pre_trigger() 



hda_ipc4_pre_trigger() has two issues:
 1. In the default case, we are returning without unlocking the mutex.
 2. In case SNDRV_PCM_TRIGGER_STOP: when ret is less than zero it goes
    to out, unlocks but returns zero instead of a negative value.

Fix this by changing the final return value to 'ret' instead of zero,
and initialize 'ret' to zero in the start of the function.

Fixes: 225f37b5 ("ASoC: SOF: ipc4-pcm: reset all pipelines during FE DAI hw_free")
Signed-off-by: default avatarHarshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20230519064404.1659637-1-harshit.m.mogalapalli@oracle.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fcbc3aac

sound/soc/sof/intel/hda-dai-ops.c

+3 −3
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int hda_ipc4_pre_trigger(struct snd_sof_dev *sdev, struct snd_soc_dai *cp 
	struct sof_ipc4_pipeline *pipeline;

	struct snd_sof_widget *swidget;

	struct snd_soc_dapm_widget *w;

	int ret;

	int ret = 0;



	w = snd_soc_dai_get_widget(cpu_dai, substream->stream);

	swidget = w->dobj.private;
@@ -208,11 +208,11 @@ static int hda_ipc4_pre_trigger(struct snd_sof_dev *sdev, struct snd_soc_dai *cp 
		break;

	default:

		dev_err(sdev->dev, "unknown trigger command %d\n", cmd);

		return -EINVAL;

		ret = -EINVAL;

	}

out:

	mutex_unlock(&ipc4_data->pipeline_state_mutex);

	return 0;

	return ret;

}



static int hda_trigger(struct snd_sof_dev *sdev, struct snd_soc_dai *cpu_dai,