From: Kalle Valo <kvalo@codeaurora.org>
Date: Tue, 4 Aug 2020 11:02:54 +0000 (+0300)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
X-Git-Tag: v5.10.7~1943^2~19^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2cfd71f1a43e9e1053db6c84f2dc33fe88128f67;p=platform%2Fkernel%2Flinux-rpi.git

Merge git://git./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.
---

2cfd71f1a43e9e1053db6c84f2dc33fe88128f67
diff --cc drivers/net/wireless/mediatek/mt76/mt7615/usb.c
index f1b4a63,5be6704..23a2133
--- a/drivers/net/wireless/mediatek/mt76/mt7615/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/usb.c
@@@ -129,17 -340,18 +130,17 @@@ alloc_queues
  
  	ret = mt76u_alloc_queues(&dev->mt76);
  	if (ret)
- 		goto error;
+ 		goto error_free_q;
  
 -	ret = mt7663u_register_device(dev);
 +	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:
 -	mt76u_deinit(&dev->mt76);
  	usb_set_intfdata(usb_intf, NULL);
  	usb_put_dev(interface_to_usbdev(usb_intf));