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

Commit fd382654 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

i7core_edac: PCI device is called NONCORE, instead of NOCORE 



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 321ece4d

drivers/edac/i7core_edac.c

+3 −3
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ struct pci_id_descr pci_dev_descr[] = { 
	 * the probing code needs to test for the other address in case of

	 * failure of this one

	 */

	{ PCI_DESCR(0, 0, PCI_DEVICE_ID_INTEL_I7_NOCORE)  },

	{ PCI_DESCR(0, 0, PCI_DEVICE_ID_INTEL_I7_NONCORE)  },



};

#define N_DEVS ARRAY_SIZE(pci_dev_descr)
@@ -1177,9 +1177,9 @@ int i7core_get_onedevice(struct pci_dev **prev, int devno) 
	 * is at addr 8086:2c40, instead of 8086:2c41. So, we need

	 * to probe for the alternate address in case of failure

	 */

	if (pci_dev_descr[devno].dev_id == PCI_DEVICE_ID_INTEL_I7_NOCORE && !pdev)

	if (pci_dev_descr[devno].dev_id == PCI_DEVICE_ID_INTEL_I7_NONCORE && !pdev)

		pdev = pci_get_device(PCI_VENDOR_ID_INTEL,

				      PCI_DEVICE_ID_INTEL_I7_NOCORE_ALT, *prev);

				      PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT, *prev);



	if (!pdev) {

		if (*prev) {

include/linux/pci_ids.h

+2 −2
Original line number Diff line number Diff line
@@ -2548,8 +2548,8 @@ 
#define PCI_DEVICE_ID_INTEL_I7_MC_CH2_ADDR  0x2c31

#define PCI_DEVICE_ID_INTEL_I7_MC_CH2_RANK  0x2c32

#define PCI_DEVICE_ID_INTEL_I7_MC_CH2_TC    0x2c33

#define PCI_DEVICE_ID_INTEL_I7_NOCORE	0x2c41

#define PCI_DEVICE_ID_INTEL_I7_NOCORE_ALT 0x2c40

#define PCI_DEVICE_ID_INTEL_I7_NONCORE	0x2c41

#define PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT 0x2c40

#define PCI_DEVICE_ID_INTEL_82855PM_HB	0x3340

#define PCI_DEVICE_ID_INTEL_IOAT_TBG4	0x3429

#define PCI_DEVICE_ID_INTEL_IOAT_TBG5	0x342a