Merge remote-tracking branch 'lightnvm/for-next'

[deliverable/linux.git] / drivers / net / wireless / broadcom / brcm80211 / brcmfmac / usb.c

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
index 98b15a9a2779f450b9bfbf760c734c870c7857fe..2f978a39b58a49485209f1da9f4f1a5c22647307 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
@@ -1099,15 +1099,11 @@ struct brcmf_usbdev *brcmf_usb_attach(struct brcmf_usbdev_info *devinfo,
        devinfo->tx_freecount = ntxq;
 
        devinfo->ctl_urb = usb_alloc_urb(0, GFP_ATOMIC);
-       if (!devinfo->ctl_urb) {
-               brcmf_err("usb_alloc_urb (ctl) failed\n");
+       if (!devinfo->ctl_urb)
                goto error;
-       }
        devinfo->bulk_urb = usb_alloc_urb(0, GFP_ATOMIC);
-       if (!devinfo->bulk_urb) {
-               brcmf_err("usb_alloc_urb (bulk) failed\n");
+       if (!devinfo->bulk_urb)
                goto error;
-       }
 
        return &devinfo->bus_pub;
 
@@ -1462,11 +1458,15 @@ static int brcmf_usb_reset_resume(struct usb_interface *intf)
 #define BRCMF_USB_DEVICE(dev_id)       \
        { USB_DEVICE(BRCM_USB_VENDOR_ID_BROADCOM, dev_id) }
 
+#define LINKSYS_USB_DEVICE(dev_id)     \
+       { USB_DEVICE(BRCM_USB_VENDOR_ID_LINKSYS, dev_id) }
+
 static struct usb_device_id brcmf_usb_devid_table[] = {
        BRCMF_USB_DEVICE(BRCM_USB_43143_DEVICE_ID),
        BRCMF_USB_DEVICE(BRCM_USB_43236_DEVICE_ID),
        BRCMF_USB_DEVICE(BRCM_USB_43242_DEVICE_ID),
        BRCMF_USB_DEVICE(BRCM_USB_43569_DEVICE_ID),
+       LINKSYS_USB_DEVICE(BRCM_USB_43235_LINKSYS_DEVICE_ID),
        { USB_DEVICE(BRCM_USB_VENDOR_ID_LG, BRCM_USB_43242_LG_DEVICE_ID) },
        /* special entry for device with firmware loaded and running */
        BRCMF_USB_DEVICE(BRCM_USB_BCMFW_DEVICE_ID),