Commit 0bce39cc authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-video' and 'acpi-hotplug' 

* acpi-video:
  ACPI: Revert "ACPI / video: Add Dell Inspiron 5737 to the blacklist"

* acpi-hotplug:
  ACPI / PCI / hotplug: unlock in error path in acpiphp_enable_slot()
parents 92e963f5 b186b4dc 2c3033a0

drivers/acpi/video_detect.c

+0 −8
Original line number Diff line number Diff line
@@ -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

drivers/pci/hotplug/acpiphp_glue.c

+3 −1
Original line number Diff line number Diff line
@@ -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))

CRA Git | Maintained and supported by SUSTech CRA and CCSE