lkml.org 
[lkml]   [2016]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 22/64] ACPI / PCI / hotplug: unlock in error path in acpiphp_enable_slot()
    Date
    4.2.8-ckt4 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Insu Yun <wuninsu@gmail.com>

    commit 2c3033a0664dfae91e1dee7fabac10f24354b958 upstream.

    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>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/pci/hotplug/acpiphp_glue.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
    index ff53856..0b3e0bf 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))
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-02-05 00:41    [W:2.688 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site