These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / usb / isp1760 / isp1760-udc.c

diff --git a/kernel/drivers/usb/isp1760/isp1760-udc.c b/kernel/drivers/usb/isp1760/isp1760-udc.c
index 3fc4fe7..1c3d0fd 100644 (file)
--- a/kernel/drivers/usb/isp1760/isp1760-udc.c
+++ b/kernel/drivers/usb/isp1760/isp1760-udc.c
@@ -812,6 +812,8 @@ static struct usb_request *isp1760_ep_alloc_request(struct usb_ep *ep,
        struct isp1760_request *req;
 
        req = kzalloc(sizeof(*req), gfp_flags);
+       if (!req)
+               return NULL;
 
        return &req->req;
 }
@@ -1380,14 +1382,25 @@ static void isp1760_udc_init_eps(struct isp1760_udc *udc)
                 * This fits in the 8kB FIFO without double-buffering.
                 */
                if (ep_num == 0) {
-                       ep->ep.maxpacket = 64;
+                       usb_ep_set_maxpacket_limit(&ep->ep, 64);
+                       ep->ep.caps.type_control = true;
+                       ep->ep.caps.dir_in = true;
+                       ep->ep.caps.dir_out = true;
                        ep->maxpacket = 64;
                        udc->gadget.ep0 = &ep->ep;
                } else {
-                       ep->ep.maxpacket = 512;
+                       usb_ep_set_maxpacket_limit(&ep->ep, 512);
+                       ep->ep.caps.type_iso = true;
+                       ep->ep.caps.type_bulk = true;
+                       ep->ep.caps.type_int = true;
                        ep->maxpacket = 0;
                        list_add_tail(&ep->ep.ep_list, &udc->gadget.ep_list);
                }
+
+               if (is_in)
+                       ep->ep.caps.dir_in = true;
+               else
+                       ep->ep.caps.dir_out = true;
        }
 }