aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/usb/composite.h3
-rw-r--r--include/linux/usb/gadget.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index cef0e44601f8..4b6b9283fa7b 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -54,6 +54,9 @@
54/* big enough to hold our biggest descriptor */ 54/* big enough to hold our biggest descriptor */
55#define USB_COMP_EP0_BUFSIZ 1024 55#define USB_COMP_EP0_BUFSIZ 1024
56 56
57/* OS feature descriptor length <= 4kB */
58#define USB_COMP_EP0_OS_DESC_BUFSIZ 4096
59
57#define USB_MS_TO_HS_INTERVAL(x) (ilog2((x * 1000 / 125)) + 1) 60#define USB_MS_TO_HS_INTERVAL(x) (ilog2((x * 1000 / 125)) + 1)
58struct usb_configuration; 61struct usb_configuration;
59 62
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 66a5cff7ee14..e3424234b23a 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -129,6 +129,7 @@ struct usb_ep_ops {
129 int (*enable) (struct usb_ep *ep, 129 int (*enable) (struct usb_ep *ep,
130 const struct usb_endpoint_descriptor *desc); 130 const struct usb_endpoint_descriptor *desc);
131 int (*disable) (struct usb_ep *ep); 131 int (*disable) (struct usb_ep *ep);
132 void (*dispose) (struct usb_ep *ep);
132 133
133 struct usb_request *(*alloc_request) (struct usb_ep *ep, 134 struct usb_request *(*alloc_request) (struct usb_ep *ep,
134 gfp_t gfp_flags); 135 gfp_t gfp_flags);