From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 8 Jan 2024 07:17:18 +0000 (+0100)
Subject: Merge branch 'for-next' into for-linus
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=821e2ac632ff77bf7abaf2dfad7214fe8563edf1;p=linux.git

Merge branch 'for-next' into for-linus

Prepare for 6.8 merge.

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

821e2ac632ff77bf7abaf2dfad7214fe8563edf1
diff --cc sound/pci/hda/cs35l41_hda_property.c
index c1afb721b4c67,fcc605be51cf7..35277ce890a46
--- a/sound/pci/hda/cs35l41_hda_property.c
+++ b/sound/pci/hda/cs35l41_hda_property.c
@@@ -208,9 -234,10 +234,9 @@@ static int generic_dsd_config(struct cs
  			 "_DSD already exists.\n");
  	}
  
- 	if (cfg->bus == SPI) {
+ 	if (cs35l41->control_bus == SPI) {
  		cs35l41->index = id;
  
 -#if IS_ENABLED(CONFIG_SPI)
  		/*
  		 * Manually set the Chip Select for the second amp <cs_gpio_index> in the node.
  		 * This is only supported for systems with 2 amps, since we cannot expand the