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

Commit 1cf53d5d authored by Kristen Carlson Accardi's avatar Kristen Carlson Accardi Committed by Greg Kroah-Hartman
Browse files

PCI Hotplug: pciehp: Dont check bridge control on remove 



When removing a device with a bridge on it, only read the
bridge control register if the adapter is actually present.

Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 89913bf7

drivers/pci/hotplug/pciehp_pci.c

+12 −6
Original line number Diff line number Diff line
@@ -243,9 +243,10 @@ int pciehp_configure_device(struct slot *p_slot) 


int pciehp_unconfigure_device(struct slot *p_slot)

{

	int rc = 0;

	int ret, rc = 0;

	int j;

	u8 bctl = 0;

	u8 presence = 0;

	struct pci_bus *parent = p_slot->ctrl->pci_dev->subordinate;



	dbg("%s: bus/dev = %x/%x\n", __FUNCTION__, p_slot->bus,
@@ -263,7 +264,11 @@ int pciehp_unconfigure_device(struct slot *p_slot) 
			continue;

		}

		if (temp->hdr_type == PCI_HEADER_TYPE_BRIDGE) {

			pci_read_config_byte(temp, PCI_BRIDGE_CONTROL, &bctl);

			ret = p_slot->hpc_ops->get_adapter_status(p_slot,

								&presence);

			if (!ret && presence) {

				pci_read_config_byte(temp, PCI_BRIDGE_CONTROL,

					&bctl);

				if (bctl & PCI_BRIDGE_CTL_VGA) {

					err("Cannot remove display device %s\n",

						pci_name(temp));
@@ -271,6 +276,7 @@ int pciehp_unconfigure_device(struct slot *p_slot) 
					continue;

				}

			}

		}

		pci_remove_bus_device(temp);

		pci_dev_put(temp);

	}