From 56adeb0a54fe730c26a82fdcec31de8a580f5aed Mon Sep 17 00:00:00 2001 From: David Vrabel Date: Mon, 7 Dec 2009 13:50:40 +0000 Subject: [PATCH] --- yaml --- r: 174983 b: refs/heads/master c: 2e9729d0f86094e52d14e8b9e17c0aad565ee477 h: refs/heads/master i: 174981: 6c25488b1cefa07e6d82eb9bf049fa2a380473fc 174979: e96f884ece204eb26eb155925734047d0c60ed81 174975: 0421c6b8b9ed0b599107f3c36c70e9682e28fed0 v: v3 --- [refs] | 2 +- trunk/drivers/usb/wusbcore/devconnect.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6a225bf4d000..99ba560a5af9 100644 --- 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 index 4ac4300a3f9a..dced419f7aba 100644 --- a/trunk/drivers/usb/wusbcore/devconnect.c +++ b/trunk/drivers/usb/wusbcore/devconnect.c @@ -119,10 +119,12 @@ 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; @@ -130,9 +132,6 @@ static struct wusb_dev *wusb_dev_alloc(struct wusbhc *wusbhc) 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);