Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2a8ecaf authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Fix detection of Creative SoundCore3D controllers 



The PCI ID entries of Creative SoundCore3D HD-audio controllers should
be before the wildcard for vendor = Creative.

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

sound/pci/hda/hda_intel.c

+5 −5
Original line number Diff line number Diff line
@@ -3354,6 +3354,11 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { 
	{ PCI_DEVICE(0x6549, 0x1200),

	  .driver_data = AZX_DRIVER_TERA | AZX_DCAPS_NO_64BIT },

	/* Creative X-Fi (CA0110-IBG) */

	/* CTHDA chips */

	{ PCI_DEVICE(0x1102, 0x0010),

	  .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },

	{ PCI_DEVICE(0x1102, 0x0012),

	  .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },

#if !defined(CONFIG_SND_CTXFI) && !defined(CONFIG_SND_CTXFI_MODULE)

	/* the following entry conflicts with snd-ctxfi driver,

	 * as ctxfi driver mutates from HD-audio to native mode with
@@ -3370,11 +3375,6 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { 
	  .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND |

	  AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_POSFIX_LPIB },

#endif

	/* CTHDA chips */

	{ PCI_DEVICE(0x1102, 0x0010),

	  .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },

	{ PCI_DEVICE(0x1102, 0x0012),

	  .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },

	/* Vortex86MX */

	{ PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC },

	/* VMware HDAudio */