Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 213535
b: refs/heads/master
c: c6a7678
h: refs/heads/master
i:
  213533: 0044a84
  213531: 6ab99c5
  213527: deda58a
  213519: 43d88c3
  213503: 7e40893
v: v3
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Oct 22, 2010
1 parent 7e8edc8 commit 3b4327d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 912c93d1606f60932de3e2f31db3722a9f069ed9
refs/heads/master: c6a76781da6b7ee2589a6ec87be30abdbc303384
16 changes: 7 additions & 9 deletions trunk/drivers/usb/gadget/dbgp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 3b4327d

Please sign in to comment.