[PATCH AUTOSEL 4.19 073/146] mt76x2u: run device cleanup routine if resume fails

[Sasha Levin]

From: Lorenzo Bianconi <lorenzo.bianc...@redhat.com>

[ Upstream commit 9b2fd48d36e25b9be9ddb8be8cc1eb263a1d1843 ]

Cleanup {tx,rx} and mcu queues if resume operation fails

Fixes: ee676cd5017c ("mt76: add driver code for MT76x2u based devices")
Signed-off-by: Lorenzo Bianconi <lorenzo.bianc...@redhat.com>
Signed-off-by: Kalle Valo <kv...@codeaurora.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/net/wireless/mediatek/mt76/mt76x2_usb.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_usb.c 
b/drivers/net/wireless/mediatek/mt76/mt76x2_usb.c
index 1428cfdee579..9594433234cc 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_usb.c
@@ -107,16 +107,24 @@ static int __maybe_unused mt76x2u_resume(struct 
usb_interface *intf)
                               mt76u_mcu_complete_urb,
                               &usb->mcu.cmpl);
        if (err < 0)
-               return err;
+               goto err;
 
        err = mt76u_submit_rx_buffers(&dev->mt76);
        if (err < 0)
-               return err;
+               goto err;
 
        tasklet_enable(&usb->rx_tasklet);
        tasklet_enable(&usb->tx_tasklet);
 
-       return mt76x2u_init_hardware(dev);
+       err = mt76x2u_init_hardware(dev);
+       if (err < 0)
+               goto err;
+
+       return 0;
+
+err:
+       mt76x2u_cleanup(dev);
+       return err;
 }
 
 MODULE_DEVICE_TABLE(usb, mt76x2u_device_table);
-- 
2.17.1