diff options
| author | Insu Yun <wuninsu@gmail.com> | 2016-01-23 15:44:19 -0500 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-02-15 15:42:28 -0500 |
| commit | 5baad2a390460d9e8bd076def84bbc56d9bf9f57 (patch) | |
| tree | bd22e25ad58acec9e7477369d925c22d93e84ddb | |
| parent | 31eef6767d9663043d746d5f51807d4f3da0a2ce (diff) | |
| download | lwn-5baad2a390460d9e8bd076def84bbc56d9bf9f57.tar.gz lwn-5baad2a390460d9e8bd076def84bbc56d9bf9f57.zip | |
ACPI / PCI / hotplug: unlock in error path in acpiphp_enable_slot()
[ Upstream commit 2c3033a0664dfae91e1dee7fabac10f24354b958 ]
In acpiphp_enable_slot(), there is a missing unlock path
when error occurred. It needs to be unlocked before returning
an error.
Signed-off-by: Insu Yun <wuninsu@gmail.com>
Cc: All applicable <stable@vger.kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index bcb90e4888dd..b60309ee80ed 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -954,8 +954,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)) |