lkml.org 
[lkml]   [2019]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.1 120/138] staging: wilc1000: fix error path cleanup in wilc_wlan_initialize()
    Date
    From: Ajay Singh <ajay.kathat@microchip.com>

    commit 6419f818ababebc1116fb2d0e220bd4fe835d0e3 upstream.

    For the error path in wilc_wlan_initialize(), the resources are not
    cleanup in the correct order. Reverted the previous changes and use the
    correct order to free during error condition.

    Fixes: b46d68825c2d ("staging: wilc1000: remove COMPLEMENT_BOOT")
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/staging/wilc1000/wilc_netdev.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    --- a/drivers/staging/wilc1000/wilc_netdev.c
    +++ b/drivers/staging/wilc1000/wilc_netdev.c
    @@ -530,17 +530,17 @@ static int wilc_wlan_initialize(struct n
    goto fail_locks;
    }

    - if (wl->gpio_irq && init_irq(dev)) {
    - ret = -EIO;
    - goto fail_locks;
    - }
    -
    ret = wlan_initialize_threads(dev);
    if (ret < 0) {
    ret = -EIO;
    goto fail_wilc_wlan;
    }

    + if (wl->gpio_irq && init_irq(dev)) {
    + ret = -EIO;
    + goto fail_threads;
    + }
    +
    if (!wl->dev_irq_num &&
    wl->hif_func->enable_interrupt &&
    wl->hif_func->enable_interrupt(wl)) {
    @@ -596,7 +596,7 @@ fail_irq_enable:
    fail_irq_init:
    if (wl->dev_irq_num)
    deinit_irq(dev);
    -
    +fail_threads:
    wlan_deinitialize_threads(dev);
    fail_wilc_wlan:
    wilc_wlan_cleanup(dev);

    \
     
     \ /
      Last update: 2019-07-12 14:38    [W:4.474 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site