From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 27 Apr 2023 12:21:18 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: v6.6.7~2882^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea3292986cc90fdd9ad9aa7018ee0651736a4529;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'for-linus' into for-next

Merge 6.3-devel branch back in order to apply the more Realtek HD-audio
changes cleanly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

ea3292986cc90fdd9ad9aa7018ee0651736a4529
diff --cc sound/soc/sof/ipc4-topology.c
index a010e7c,3a5394c..059eebf
--- a/sound/soc/sof/ipc4-topology.c
+++ b/sound/soc/sof/ipc4-topology.c
@@@ -2337,22 -1805,13 +2337,24 @@@ static int sof_ipc4_route_setup(struct 
  	u32 header, extension;
  	int ret;
  
 +	/* no route set up if chain DMA is used */
 +	if (src_pipeline->use_chain_dma || sink_pipeline->use_chain_dma) {
 +		if (!src_pipeline->use_chain_dma || !sink_pipeline->use_chain_dma) {
 +			dev_err(sdev->dev,
 +				"use_chain_dma must be set for both src %s and sink %s pipelines\n",
 +				src_widget->widget->name, sink_widget->widget->name);
 +			return -EINVAL;
 +		}
 +		return 0;
 +	}
 +
  	if (!src_fw_module || !sink_fw_module) {
- 		/* The NULL module will print as "(efault)" */
- 		dev_err(sdev->dev, "source %s or sink %s widget weren't set up properly\n",
- 			src_fw_module->man4_module_entry.name,
- 			sink_fw_module->man4_module_entry.name);
+ 		dev_err(sdev->dev,
+ 			"cannot bind %s -> %s, no firmware module for: %s%s\n",
+ 			src_widget->widget->name, sink_widget->widget->name,
+ 			src_fw_module ? "" : " source",
+ 			sink_fw_module ? "" : " sink");
+ 
  		return -ENODEV;
  	}