aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/wusbcore/devconnect.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/wusbcore/devconnect.c b/drivers/usb/wusbcore/devconnect.c
index 4ac4300a3f9a..dced419f7aba 100644
--- a/drivers/usb/wusbcore/devconnect.c
+++ b/drivers/usb/wusbcore/devconnect.c
@@ -119,10 +119,12 @@ static struct wusb_dev *wusb_dev_alloc(struct wusbhc *wusbhc)
119 urb = usb_alloc_urb(0, GFP_KERNEL); 119 urb = usb_alloc_urb(0, GFP_KERNEL);
120 if (urb == NULL) 120 if (urb == NULL)
121 goto err; 121 goto err;
122 wusb_dev->set_gtk_urb = urb;
122 123
123 req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL); 124 req = kmalloc(sizeof(*req), GFP_KERNEL);
124 if (req == NULL) 125 if (req == NULL)
125 goto err; 126 goto err;
127 wusb_dev->set_gtk_req = req;
126 128
127 req->bRequestType = USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE; 129 req->bRequestType = USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE;
128 req->bRequest = USB_REQ_SET_DESCRIPTOR; 130 req->bRequest = USB_REQ_SET_DESCRIPTOR;
@@ -130,9 +132,6 @@ static struct wusb_dev *wusb_dev_alloc(struct wusbhc *wusbhc)
130 req->wIndex = 0; 132 req->wIndex = 0;
131 req->wLength = cpu_to_le16(wusbhc->gtk.descr.bLength); 133 req->wLength = cpu_to_le16(wusbhc->gtk.descr.bLength);
132 134
133 wusb_dev->set_gtk_urb = urb;
134 wusb_dev->set_gtk_req = req;
135
136 return wusb_dev; 135 return wusb_dev;
137err: 136err:
138 wusb_dev_free(wusb_dev); 137 wusb_dev_free(wusb_dev);