diff --git a/[refs] b/[refs] index c1a8666c765a..39717bb31b34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 912c93d1606f60932de3e2f31db3722a9f069ed9 +refs/heads/master: c6a76781da6b7ee2589a6ec87be30abdbc303384 diff --git a/trunk/drivers/usb/gadget/dbgp.c b/trunk/drivers/usb/gadget/dbgp.c index 0ed50a2c0a36..abe4a2ec5625 100644 --- a/trunk/drivers/usb/gadget/dbgp.c +++ b/trunk/drivers/usb/gadget/dbgp.c @@ -386,15 +386,13 @@ static int dbgp_setup(struct usb_gadget *gadget, } else goto fail; - if (len >= 0) { - req->length = min(length, len); - req->zero = len < req->length; - if (data && req->length) - memcpy(req->buf, data, req->length); - - req->complete = dbgp_setup_complete; - return usb_ep_queue(gadget->ep0, req, GFP_ATOMIC); - } + req->length = min(length, len); + req->zero = len < req->length; + if (data && req->length) + memcpy(req->buf, data, req->length); + + req->complete = dbgp_setup_complete; + return usb_ep_queue(gadget->ep0, req, GFP_ATOMIC); fail: dev_dbg(&dbgp.gadget->dev,