4 files changed, 15 insertions, 11 deletions

diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
index 2a47e82821da..5440131cd4ee 100644
--- a/drivers/pci/hotplug/acpi_pcihp.c
+++ b/drivers/pci/hotplug/acpi_pcihp.c
@@ -411,13 +411,10 @@ EXPORT_SYMBOL(acpi_get_hp_hw_control_from_firmware);
 static int pcihp_is_ejectable(acpi_handle handle)
 {
         acpi_status status;
-        acpi_handle tmp;
         unsigned long long removable;
-        status = acpi_get_handle(handle, "_ADR", &tmp);
-        if (ACPI_FAILURE(status))
+        if (!acpi_has_method(handle, "_ADR"))
                 return 0;
-        status = acpi_get_handle(handle, "_EJ0", &tmp);
-        if (ACPI_SUCCESS(status))
+        if (acpi_has_method(handle, "_EJ0"))
                 return 1;
         status = acpi_evaluate_integer(handle, "_RMV", NULL, &removable);
         if (ACPI_SUCCESS(status) && removable)
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 5246ba297470..e98018b43e2a 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -990,14 +990,16 @@ void acpiphp_enumerate_slots(struct pci_bus *bus)
 
                 /*
                  * This bridge should have been registered as a hotplug function
-                 * under its parent, so the context has to be there.  If not, we
-                 * are in deep goo.
+                 * under its parent, so the context should be there, unless the
+                 * parent is going to be handled by pciehp, in which case this
+                 * bridge is not interesting to us either.
                  */
                 mutex_lock(&acpiphp_context_lock);
                 context = acpiphp_get_context(handle);
-                if (WARN_ON(!context)) {
+                if (!context) {
                         mutex_unlock(&acpiphp_context_lock);
                         put_device(&bus->dev);
+                        pci_dev_put(bridge->pci_dev);
                         kfree(bridge);
                         return;
                 }
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index b0299e6d9a3f..dfd1f59de729 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -181,7 +181,6 @@ static bool acpi_pci_power_manageable(struct pci_dev *dev)
 static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
 {
         acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
-        acpi_handle tmp;
         static const u8 state_conv[] = {
                 [PCI_D0] = ACPI_STATE_D0,
                 [PCI_D1] = ACPI_STATE_D1,
@@ -192,7 +191,7 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
         int error = -EINVAL;
 
         /* If the ACPI device has _EJ0, ignore the device */
-        if (!handle || ACPI_SUCCESS(acpi_get_handle(handle, "_EJ0", &tmp)))
+        if (!handle || acpi_has_method(handle, "_EJ0"))
                 return -ENODEV;
 
         switch (state) {
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index e8ccf6c0f08a..bdd64b1b4817 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1155,8 +1155,14 @@ static void pci_enable_bridge(struct pci_dev *dev)
 
         pci_enable_bridge(dev->bus->self);
 
-        if (pci_is_enabled(dev))
+        if (pci_is_enabled(dev)) {
+                if (!dev->is_busmaster) {
+                        dev_warn(&dev->dev, "driver skip pci_set_master, fix it!\n");
+                        pci_set_master(dev);
+                }
                 return;
+        }
+
         retval = pci_enable_device(dev);
         if (retval)
                 dev_err(&dev->dev, "Error enabling bridge (%d), continuing\n",