Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 27 Apr 2023 12:21:18 +0000 (14:21 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 27 Apr 2023 12:21:18 +0000 (14:21 +0200)
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>
1  2 
sound/pci/emu10k1/emupcm.c
sound/pci/hda/patch_hdmi.c
sound/pci/ymfpci/ymfpci.c
sound/pci/ymfpci/ymfpci_main.c
sound/soc/fsl/fsl_sai.c
sound/soc/sof/ipc4-topology.c
sound/soc/sof/pm.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index a010e7c38817e05649b4b61123642ed68f2dac4d,3a5394c3dd83bf35053bd5e398de7f345bd1c7ba..059eebf0a68756dc6c99882e7dcd6f0a118daa69
@@@ -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;
        }
  
Simple merge