Merge tag 'v4.4.214' into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / net / wireless / brcm80211 / brcmfmac / usb.c

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index 3002268..2cb3f12 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -426,6 +426,7 @@ fail:
                        usb_free_urb(req->urb);
                list_del(q->next);
        }
+       kfree(reqs);
        return NULL;
 
 }
@@ -1352,7 +1353,7 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                goto fail;
        }
 
-       desc = &intf->altsetting[0].desc;
+       desc = &intf->cur_altsetting->desc;
        if ((desc->bInterfaceClass != USB_CLASS_VENDOR_SPEC) ||
            (desc->bInterfaceSubClass != 2) ||
            (desc->bInterfaceProtocol != 0xff)) {
@@ -1365,7 +1366,7 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
        num_of_eps = desc->bNumEndpoints;
        for (ep = 0; ep < num_of_eps; ep++) {
-               endpoint = &intf->altsetting[0].endpoint[ep].desc;
+               endpoint = &intf->cur_altsetting->endpoint[ep].desc;
                endpoint_num = usb_endpoint_num(endpoint);
                if (!usb_endpoint_xfer_bulk(endpoint))
                        continue;