Commit 1a76dcea authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/hotplug' 

- Remove unneeded break in ibmphp (Bjorn Helgaas)

- Fix pci_slot_release() NULL pointer dereference (Jubin Zhong)

* pci/hotplug:
  PCI: Fix pci_slot_release() NULL pointer dereference
  PCI: ibmphp: Remove unneeded break
parents 6a94785f 4684709b

drivers/pci/hotplug/ibmphp_pci.c

+0 −2
Original line number Diff line number Diff line
@@ -294,7 +294,6 @@ int ibmphp_configure_card(struct pci_func *func, u8 slotno) 
				default:

					err("MAJOR PROBLEM!!!!, header type not supported? %x\n", hdr_type);

					return -ENXIO;

					break;

			}	/* end of switch */

		}	/* end of valid device */

	}	/* end of for */
@@ -1509,7 +1508,6 @@ static int unconfigure_boot_card(struct slot *slot_cur) 
				default:

					err("MAJOR PROBLEM!!!! Cannot read device's header\n");

					return -1;

					break;

			}	/* end of switch */

		}	/* end of valid device */

	}	/* end of for */

drivers/pci/slot.c

+3 −3
Original line number Diff line number Diff line
@@ -272,6 +272,9 @@ placeholder: 
		goto err;

	}



	INIT_LIST_HEAD(&slot->list);

	list_add(&slot->list, &parent->slots);



	err = kobject_init_and_add(&slot->kobj, &pci_slot_ktype, NULL,

				   "%s", slot_name);

	if (err) {
@@ -279,9 +282,6 @@ placeholder: 
		goto err;

	}



	INIT_LIST_HEAD(&slot->list);

	list_add(&slot->list, &parent->slots);



	down_read(&pci_bus_sem);

	list_for_each_entry(dev, &parent->devices, bus_list)

		if (PCI_SLOT(dev->devfn) == slot_nr)

CRA Git | Maintained and supported by SUSTech CRA and CCSE