summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2011-06-29 16:41:57 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-01 14:27:08 -0700
commit877c1f5408a94cd8a0fa1de4e4806830c1839e8d (patch)
treee7b10b8d05654186ecd661416b6ea8ca0eab59d7 /drivers/usb
parent513385a3cf97e9fb7e982afffeb013a12a7ccbd2 (diff)
downloadlinux-3.10-877c1f5408a94cd8a0fa1de4e4806830c1839e8d.tar.gz
linux-3.10-877c1f5408a94cd8a0fa1de4e4806830c1839e8d.tar.bz2
linux-3.10-877c1f5408a94cd8a0fa1de4e4806830c1839e8d.zip
usb: gadget: ci13xx_udc: fix usb_ep_enable() call
commit 72c973d (usb: gadget: add usb_endpoint_descriptor to struct usb_ep) has introduced a compile error to ci13xxx_udc. Fix it. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/ci13xxx_udc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c
index 909bc45c0be..082471650fb 100644
--- a/drivers/usb/gadget/ci13xxx_udc.c
+++ b/drivers/usb/gadget/ci13xxx_udc.c
@@ -2620,10 +2620,13 @@ static int ci13xxx_start(struct usb_gadget_driver *driver,
if (retval)
goto done;
spin_unlock_irqrestore(udc->lock, flags);
- retval = usb_ep_enable(&udc->ep0out.ep, &ctrl_endpt_out_desc);
+ udc->ep0out.ep.desc = &ctrl_endpt_out_desc;
+ retval = usb_ep_enable(&udc->ep0out.ep);
if (retval)
return retval;
- retval = usb_ep_enable(&udc->ep0in.ep, &ctrl_endpt_in_desc);
+
+ udc->ep0in.ep.desc = &ctrl_endpt_in_desc;
+ retval = usb_ep_enable(&udc->ep0in.ep);
if (retval)
return retval;
spin_lock_irqsave(udc->lock, flags);