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:  Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c
index 854aaea09e4db788bc048739ffbe9b20bc8e0140..8f2b25c49f84c58cd9a344feec569aa13962add8 100644 (file)
--- a/drivers/pci/hotplug/pciehp_pci.c
+++ b/drivers/pci/hotplug/pciehp_pci.c
@@ -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,12 +264,17 @@ 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);
-                       if (bctl & PCI_BRIDGE_CTL_VGA) {
-                               err("Cannot remove display device %s\n",
+                       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));
-                               pci_dev_put(temp);
-                               continue;
+                                       pci_dev_put(temp);
+                                       continue;
+                               }
                        }
                }
                pci_remove_bus_device(temp);