Commit f549a82a authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Takashi Iwai
Browse files

ASoC: SOF: core: Ensure sof_ops_free() is still called when probe never ran. 



In an effort to not call sof_ops_free twice, we stopped running it when
probe was aborted.

Check the result of cancel_work_sync to see if this was the case.

Fixes: 31bb7bd9 ("ASoC: SOF: core: Only call sof_ops_free() on remove if the probe was successful")
Cc: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://lore.kernel.org/r/20231009115437.99976-2-maarten.lankhorst@linux.intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 87543ce5

sound/soc/sof/core.c

+5 −1
Original line number Diff line number Diff line
@@ -459,9 +459,10 @@ int snd_sof_device_remove(struct device *dev) 
	struct snd_sof_dev *sdev = dev_get_drvdata(dev);

	struct snd_sof_pdata *pdata = sdev->pdata;

	int ret;

	bool aborted = false;



	if (IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE))

		cancel_work_sync(&sdev->probe_work);

		aborted = cancel_work_sync(&sdev->probe_work);



	/*

	 * Unregister any registered client device first before IPC and debugfs
@@ -487,6 +488,9 @@ int snd_sof_device_remove(struct device *dev) 
		snd_sof_free_debug(sdev);

		snd_sof_remove(sdev);

		sof_ops_free(sdev);

	} else if (aborted) {

		/* probe_work never ran */

		sof_ops_free(sdev);

	}



	/* release firmware */