ALSA: lx6464es: Fix duplicated SSID entries (1983126f) · Commits · 戴 / test

PCI_DEVICE() macro itself defines SSID entries while we override them after that. Replace with a more appropriate macro, PCI_DEVICE_SUB() to define all ID values properly. Spotted by sparse: sound/pci/lx6464es/lx6464es.c:60:11: warning: Initializer entry defined twice sound/pci/lx6464es/lx6464es.c:61:12: also defined here sound/pci/lx6464es/lx6464es.c:64:11: warning: Initializer entry defined twice sound/pci/lx6464es/lx6464es.c:65:12: also defined here Signed-off-by:

Takashi Iwai <tiwai@suse.de>

sound/pci/lx6464es/lx6464es.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -57,13 +57,13 @@ static const char card_name[] = "LX6464ES";
		#define PCI_DEVICE_ID_PLX_LX6464ES PCI_DEVICE_ID_PLX_9056

		static const struct pci_device_id snd_lx6464es_ids[] = {
		{ PCI_DEVICE(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES),
		.subvendor = PCI_VENDOR_ID_DIGIGRAM,
		.subdevice = PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_SERIAL_SUBSYSTEM
		{ PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES,
		PCI_VENDOR_ID_DIGIGRAM,
		PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_SERIAL_SUBSYSTEM),
		}, /* LX6464ES */
		{ PCI_DEVICE(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES),
		.subvendor = PCI_VENDOR_ID_DIGIGRAM,
		.subdevice = PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_CAE_SERIAL_SUBSYSTEM
		{ PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES,
		PCI_VENDOR_ID_DIGIGRAM,
		PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_CAE_SERIAL_SUBSYSTEM),
		}, /* LX6464ES-CAE */
		{ 0, },
		};

Admin message