apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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()
This commit is contained in:
Rafael J. Wysocki
2016-01-29 21:44:53 +01:00
parent 92e963f50f b186b4dcb7 2c3033a066
commit 0bce39ccb2
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/pci/hotplug/acpiphp_glue.c
+3 -1
View File
@@ -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))