Merge remote-tracking branch 'usb-gadget/next'

[deliverable/linux.git] / drivers / usb / gadget / function / f_sourcesink.c

diff --git a/drivers/usb/gadget/function/f_sourcesink.c b/drivers/usb/gadget/function/f_sourcesink.c
index df0189ddfdd5fef4248c1528d29835a7b95c5ca0..8784fa12ea2c637b52857a15f01f6dbeb965ec15 100644 (file)
--- a/drivers/usb/gadget/function/f_sourcesink.c
+++ b/drivers/usb/gadget/function/f_sourcesink.c
@@ -293,9 +293,7 @@ static struct usb_gadget_strings *sourcesink_strings[] = {
 
 static inline struct usb_request *ss_alloc_ep_req(struct usb_ep *ep, int len)
 {
-       struct f_sourcesink             *ss = ep->driver_data;
-
-       return alloc_ep_req(ep, len, ss->buflen);
+       return alloc_ep_req(ep, len);
 }
 
 static void disable_ep(struct usb_composite_dev *cdev, struct usb_ep *ep)
@@ -606,7 +604,7 @@ static int source_sink_start_ep(struct f_sourcesink *ss, bool is_in,
        } else {
                ep = is_in ? ss->in_ep : ss->out_ep;
                qlen = ss->bulk_qlen;
-               size = 0;
+               size = ss->buflen;
        }
 
        for (i = 0; i < qlen; i++) {