Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/writeback

[karo-tx-linux.git] / drivers / usb / gadget / dbgp.c

diff --git a/drivers/usb/gadget/dbgp.c b/drivers/usb/gadget/dbgp.c
index dbe92ee88477efc456857a70b2241881c00d7038..8beefdd367875542e0d3e02c20041ff59a2ffe53 100644 (file)
--- a/drivers/usb/gadget/dbgp.c
+++ b/drivers/usb/gadget/dbgp.c
@@ -173,7 +173,9 @@ fail_1:
 
 static int __enable_ep(struct usb_ep *ep, struct usb_endpoint_descriptor *desc)
 {
-       int err = usb_ep_enable(ep, desc);
+       int err;
+       ep->desc = desc;
+       err = usb_ep_enable(ep);
        ep->driver_data = dbgp.gadget;
        return err;
 }
@@ -268,8 +270,8 @@ static int __init dbgp_configure_endpoints(struct usb_gadget *gadget)
        dbgp.serial->in = dbgp.i_ep;
        dbgp.serial->out = dbgp.o_ep;
 
-       dbgp.serial->in_desc = &i_desc;
-       dbgp.serial->out_desc = &o_desc;
+       dbgp.serial->in->desc = &i_desc;
+       dbgp.serial->out->desc = &o_desc;
 
        if (gserial_setup(gadget, 1) < 0) {
                stp = 3;
@@ -312,7 +314,6 @@ static int __init dbgp_bind(struct usb_gadget *gadget)
 
        dbgp.req->length = DBGP_REQ_EP0_LEN;
        gadget->ep0->driver_data = gadget;
-       device_desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
 
 #ifdef CONFIG_USB_G_DBGP_SERIAL
        dbgp.serial = kzalloc(sizeof(struct gserial), GFP_KERNEL);
@@ -363,6 +364,7 @@ static int dbgp_setup(struct usb_gadget *gadget,
                        dev_dbg(&dbgp.gadget->dev, "setup: desc device\n");
                        len = sizeof device_desc;
                        data = &device_desc;
+                       device_desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
                        break;
                case USB_DT_DEBUG:
                        dev_dbg(&dbgp.gadget->dev, "setup: desc debug\n");