mt76x2u: run device cleanup routine if resume fails
authorLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Fri, 24 Aug 2018 08:17:49 +0000 (10:17 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Nov 2018 19:08:29 +0000 (11:08 -0800)
[ 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.bianconi@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/wireless/mediatek/mt76/mt76x2_usb.c

index 1428cfd..9594433 100644 (file)
@@ -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);