Skip to content

Commit de6aa72

Browse files
ujfalusibroonie
authored andcommitted
ASoC: SOF: ipc4-topology: Clarify bind failure caused by missing fw_module
The original patch uses a feature in lib/vsprintf.c to handle the invalid address when tring to print *_fw_module->man4_module_entry.name when the *rc_fw_module is NULL. This case is handled by check_pointer_msg() internally and turns the invalid pointer to '(efault)' for printing but it is hiding useful information about the circumstances. Change the print to emmit the name of the widget and a note on which side's fw_module is missing. Fixes: e3720f9 ("ASoC: SOF: avoid a NULL dereference with unsupported widgets") Reported-by: Dan Carpenter <error27@gmail.com> Link: https://lore.kernel.org/alsa-devel/4826f662-42f0-4a82-ba32-8bf5f8a03256@kili.mountain/ Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Rule: 'Cc: stable@vger.kernel.org' or 'commit <sha1> upstream.' Link: https://lore.kernel.org/r/20230403090909.18233-1-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent e3720f9 commit de6aa72

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

sound/soc/sof/ipc4-topology.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1806,10 +1806,12 @@ static int sof_ipc4_route_setup(struct snd_sof_dev *sdev, struct snd_sof_route *
18061806
int ret;
18071807

18081808
if (!src_fw_module || !sink_fw_module) {
1809-
/* The NULL module will print as "(efault)" */
1810-
dev_err(sdev->dev, "source %s or sink %s widget weren't set up properly\n",
1811-
src_fw_module->man4_module_entry.name,
1812-
sink_fw_module->man4_module_entry.name);
1809+
dev_err(sdev->dev,
1810+
"cannot bind %s -> %s, no firmware module for: %s%s\n",
1811+
src_widget->widget->name, sink_widget->widget->name,
1812+
src_fw_module ? "" : " source",
1813+
sink_fw_module ? "" : " sink");
1814+
18131815
return -ENODEV;
18141816
}
18151817

0 commit comments

Comments
 (0)