---

yaml --- r: 174983 b: refs/heads/master c: 2e9729d h: refs/heads/master i: 174981: 6c25488 174979: e96f884 174975: 0421c6b v: v3
git-mirror · Dec 11, 2009 · 56adeb0 · 56adeb0
1 parent 8d587ef
commit 56adeb0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d370755dd4ad3d119818579cfa3eb2e9978b3eb
+refs/heads/master: 2e9729d0f86094e52d14e8b9e17c0aad565ee477
diff --git a/trunk/drivers/usb/wusbcore/devconnect.c b/trunk/drivers/usb/wusbcore/devconnect.c
@@ -119,20 +119,19 @@ static struct wusb_dev *wusb_dev_alloc(struct wusbhc *wusbhc)
 	urb = usb_alloc_urb(0, GFP_KERNEL);
 	if (urb == NULL)
 		goto err;
+	wusb_dev->set_gtk_urb = urb;
 
-	req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL);
+	req = kmalloc(sizeof(*req), GFP_KERNEL);
 	if (req == NULL)
 		goto err;
+	wusb_dev->set_gtk_req = req;
 
 	req->bRequestType = USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE;
 	req->bRequest = USB_REQ_SET_DESCRIPTOR;
 	req->wValue = cpu_to_le16(USB_DT_KEY << 8 | wusbhc->gtk_index);
 	req->wIndex = 0;
 	req->wLength = cpu_to_le16(wusbhc->gtk.descr.bLength);
 
-	wusb_dev->set_gtk_urb = urb;
-	wusb_dev->set_gtk_req = req;
-
 	return wusb_dev;
 err:
 	wusb_dev_free(wusb_dev);