diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-13 12:37:40 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-13 12:37:40 -0500 |
commit | 121a8cdd79e2c68ae78c7633f2a46ee65a177ff6 (patch) | |
tree | 03793bef35f590718ebc6ae6110eb0c507ae60bf /drivers/usb/gadget/atmel_usba_udc.c | |
parent | a1016ce33ce23296ad030e5276fcfdf9cb27cb6a (diff) | |
parent | 15a3838b101b292c2e40824d843a4d8871ac4010 (diff) |
Merge branch 'for-next/gadget' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
* 'for-next/gadget' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb: (50 commits)
usb: renesas_usbhs: show error reason on usbhsh_urb_enqueu()
usb: renesas_usbhs: add force packet remove method
usb: renesas_usbhs: care usb_hcd_giveback_urb() status
usb: renesas_usbhs: add usbhsh_is_running()
usb: renesas_usbhs: disable attch irq after device attached
usb: renesas_usbhs: care pipe sequence
usb: renesas_usbhs: add usbhs_pipe_attach() method
usb: renesas_usbhs: add usbhsh_endpoint_detach_all() for error case
usb: renesas_usbhs: modify device attach method
usb: renesas_usbhs: pop packet when urb dequeued
usb: renesas_usbhs: add lost error value when enqueue
usb: gadget: mv_udc: replace some debug info
usb: gadget: mv_udc: refine suspend/resume function
usb: gadget: mv_udc: refine the clock relative code
usb: gadget: mv_udc: disable ISR when stopped
usb: gadget: mv_udc: add otg relative code
usb: gadget: Use kcalloc instead of kzalloc to allocate array
usb: renesas_usbhs: remove the_controller_link
usb: renesas_usbhs: add test-mode support
usb: renesas_usbhs: call usbhsg_queue_pop() when pipe disable.
...
Diffstat (limited to 'drivers/usb/gadget/atmel_usba_udc.c')
-rw-r--r-- | drivers/usb/gadget/atmel_usba_udc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index 271a9d873608..e2fb6d583bd9 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c | |||
@@ -1038,7 +1038,7 @@ static struct usba_udc the_udc = { | |||
1038 | .gadget = { | 1038 | .gadget = { |
1039 | .ops = &usba_udc_ops, | 1039 | .ops = &usba_udc_ops, |
1040 | .ep_list = LIST_HEAD_INIT(the_udc.gadget.ep_list), | 1040 | .ep_list = LIST_HEAD_INIT(the_udc.gadget.ep_list), |
1041 | .is_dualspeed = 1, | 1041 | .max_speed = USB_SPEED_HIGH, |
1042 | .name = "atmel_usba_udc", | 1042 | .name = "atmel_usba_udc", |
1043 | .dev = { | 1043 | .dev = { |
1044 | .init_name = "gadget", | 1044 | .init_name = "gadget", |