diff --git a/[refs] b/[refs] index dbfc9d4bfc31..6f979b7da7bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1662e3a7f076e51e3073faf9ce77157b529c475b +refs/heads/master: 090b90118207e786d2990310d063fda5d52cce6e diff --git a/trunk/drivers/usb/gadget/f_rndis.c b/trunk/drivers/usb/gadget/f_rndis.c index 3a8bb53fc473..fd7b356f902d 100644 --- a/trunk/drivers/usb/gadget/f_rndis.c +++ b/trunk/drivers/usb/gadget/f_rndis.c @@ -437,7 +437,7 @@ rndis_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl) DBG(cdev, "rndis req%02x.%02x v%04x i%04x l%d\n", ctrl->bRequestType, ctrl->bRequest, w_value, w_index, w_length); - req->zero = 0; + req->zero = (value < w_length); req->length = value; value = usb_ep_queue(cdev->gadget->ep0, req, GFP_ATOMIC); if (value < 0)