2 files changed, 3 insertions, 9 deletions

diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 90e2d54be526..1316ddd92fac 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -135,14 +135,6 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
                 DMI_MATCH(DMI_PRODUCT_NAME, "UL30A"),
                 },
         },
-        {
-        .callback = video_detect_force_vendor,
-        .ident = "Dell Inspiron 5737",
-        .matches = {
-                DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 5737"),
-                },
-        },
 
         /*
          * These models have a working acpi_video backlight control, and using
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 5f2fda12e006..fa49f9143b80 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -953,8 +953,10 @@ int acpiphp_enable_slot(struct acpiphp_slot *slot)
 {
         pci_lock_rescan_remove();
 
-        if (slot->flags & SLOT_IS_GOING_AWAY)
+        if (slot->flags & SLOT_IS_GOING_AWAY) {
+                pci_unlock_rescan_remove();
                 return -ENODEV;
+        }
 
         /* configure all functions */
         if (!(slot->flags & SLOT_ENABLED))