diff options
Diffstat (limited to 'drivers/usb/gadget/dbgp.c')
-rw-r--r-- | drivers/usb/gadget/dbgp.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/usb/gadget/dbgp.c b/drivers/usb/gadget/dbgp.c index 0ed50a2c0a36..abe4a2ec5625 100644 --- a/drivers/usb/gadget/dbgp.c +++ b/drivers/usb/gadget/dbgp.c | |||
@@ -386,15 +386,13 @@ static int dbgp_setup(struct usb_gadget *gadget, | |||
386 | } else | 386 | } else |
387 | goto fail; | 387 | goto fail; |
388 | 388 | ||
389 | if (len >= 0) { | 389 | req->length = min(length, len); |
390 | req->length = min(length, len); | 390 | req->zero = len < req->length; |
391 | req->zero = len < req->length; | 391 | if (data && req->length) |
392 | if (data && req->length) | 392 | memcpy(req->buf, data, req->length); |
393 | memcpy(req->buf, data, req->length); | 393 | |
394 | 394 | req->complete = dbgp_setup_complete; | |
395 | req->complete = dbgp_setup_complete; | 395 | return usb_ep_queue(gadget->ep0, req, GFP_ATOMIC); |
396 | return usb_ep_queue(gadget->ep0, req, GFP_ATOMIC); | ||
397 | } | ||
398 | 396 | ||
399 | fail: | 397 | fail: |
400 | dev_dbg(&dbgp.gadget->dev, | 398 | dev_dbg(&dbgp.gadget->dev, |