View | Details | Raw Unified | Return to bug 50491
Collapse All | Expand All

(-)linux-3.7-rc6.orig/drivers/edac/i7core_edac.c (-2 / +7 lines)
Lines 1334-1347 static int i7core_get_onedevice(struct p Link Here
1334
	 * is at addr 8086:2c40, instead of 8086:2c41. So, we need
1334
	 * is at addr 8086:2c40, instead of 8086:2c41. So, we need
1335
	 * to probe for the alternate address in case of failure
1335
	 * to probe for the alternate address in case of failure
1336
	 */
1336
	 */
1337
	if (dev_descr->dev_id == PCI_DEVICE_ID_INTEL_I7_NONCORE && !pdev)
1337
	if (dev_descr->dev_id == PCI_DEVICE_ID_INTEL_I7_NONCORE && !pdev) {
1338
		pci_dev_get(*prev);	/* pci_get_device will put it */
1338
		pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
1339
		pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
1339
				      PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT, *prev);
1340
				      PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT, *prev);
1341
	}
1340
1342
1341
	if (dev_descr->dev_id == PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE && !pdev)
1343
	if (dev_descr->dev_id == PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE &&
1344
	    !pdev) {
1345
		pci_dev_get(*prev);	/* pci_get_device will put it */
1342
		pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
1346
		pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
1343
				      PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_ALT,
1347
				      PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_ALT,
1344
				      *prev);
1348
				      *prev);
1349
	}
1345
1350
1346
	if (!pdev) {
1351
	if (!pdev) {
1347
		if (*prev) {
1352
		if (*prev) {

Return to bug 50491