diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2020-08-04 14:02:54 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2020-08-04 14:02:54 +0300 |
| commit | 2cfd71f1a43e9e1053db6c84f2dc33fe88128f67 (patch) | |
| tree | 777ad43d30e00597687256da0d5a1f966df99f3e /drivers/net/wireless/mediatek/mt76/mt7615/usb.c | |
| parent | 3dc05ffb04436020f63138186dbc4f37bd938552 (diff) | |
| parent | 1cfd3426ef989b83fa6176490a38777057e57f6c (diff) | |
| download | linux-2cfd71f1a43e9e1053db6c84f2dc33fe88128f67.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
mt76 driver had major conflicts within mt7615 directory. To make it easier for
every merge wireless-drivers to wireless-drivers-next and solve those
conflicts.
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mt7615/usb.c')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7615/usb.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb.c b/drivers/net/wireless/mediatek/mt76/mt7615/usb.c index f1b4a6316db3..23a21338c46e 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/usb.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/usb.c @@ -119,25 +119,26 @@ static int mt7663u_probe(struct usb_interface *usb_intf, if (!mt76_poll_msec(dev, MT_CONN_ON_MISC, MT_TOP_MISC2_FW_PWR_ON, FW_STATE_PWR_ON << 1, 500)) { dev_err(dev->mt76.dev, "Timeout for power on\n"); - return -EIO; + ret = -EIO; + goto error; } alloc_queues: ret = mt76u_alloc_mcu_queue(&dev->mt76); if (ret) - goto error; + goto error_free_q; ret = mt76u_alloc_queues(&dev->mt76); if (ret) - goto error; + goto error_free_q; ret = mt7663_usb_sdio_register_device(dev); if (ret) - goto error_freeq; + goto error_free_q; return 0; -error_freeq: +error_free_q: mt76u_queues_deinit(&dev->mt76); error: usb_set_intfdata(usb_intf, NULL); |