From 3b4327d13a8e5eb665e71df3b513ee060ce44e42 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 12 Aug 2010 09:40:30 +0200 Subject: [PATCH] --- yaml --- r: 213535 b: refs/heads/master c: c6a76781da6b7ee2589a6ec87be30abdbc303384 h: refs/heads/master i: 213533: 0044a84826798f804a2548240aed4b0993ec8c9e 213531: 6ab99c53ed8135514393f216c5e429cddb61c3cf 213527: deda58a7fec36b5b0d244c6b83e3cbb48f62b838 213519: 43d88c34812843f90838cd47cde21f9f1210ef79 213503: 7e408932e72e7fc78d37324b327ebb744403e02f v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/dbgp.c | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) 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,