[PATCH AUTOSEL 4.19 127/167] staging: wilc1000: fix error path cleanup in wilc_wlan_initialize()

[Sasha Levin]

From: Ajay Singh <ajay.kat...@microchip.com>

[ Upstream commit 6419f818ababebc1116fb2d0e220bd4fe835d0e3 ]

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: <sta...@vger.kernel.org>
Signed-off-by: Ajay Singh <ajay.kat...@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/staging/wilc1000/linux_wlan.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/wilc1000/linux_wlan.c 
b/drivers/staging/wilc1000/linux_wlan.c
index 649caae2b6033..25798119426b3 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -649,17 +649,17 @@ static int wilc_wlan_initialize(struct net_device *dev, 
struct wilc_vif *vif)
                        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)) {
@@ -715,7 +715,7 @@ static int wilc_wlan_initialize(struct net_device *dev, 
struct wilc_vif *vif)
 fail_irq_init:
                if (wl->dev_irq_num)
                        deinit_irq(dev);
-
+fail_threads:
                wlan_deinitialize_threads(dev);
 fail_wilc_wlan:
                wilc_wlan_cleanup(dev);
-- 
2.20.1