diff options
| author | Ming Lei <tom.leiming@gmail.com> | 2010-09-20 10:32:04 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-24 11:05:01 -0700 |
| commit | 1018b4e44f4f191c6e3c631c4eee35d0a112d32b (patch) | |
| tree | f59207633a930fc265772264634117da6f16c764 /drivers/usb/musb | |
| parent | 490e5fbe8ccb198fb719ae49eaa0c7071273e016 (diff) | |
| download | linux-1018b4e44f4f191c6e3c631c4eee35d0a112d32b.tar.gz linux-1018b4e44f4f191c6e3c631c4eee35d0a112d32b.tar.bz2 linux-1018b4e44f4f191c6e3c631c4eee35d0a112d32b.zip | |
usb: musb: gadget: fix DMA length for OUT transfer
DMA length should not go beyond the availabe space of request buffer,
so fix it.
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Acked-by: Anand Gadiyar <gadiyar@ti.com>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Anand Gadiyar <gadiyar@ti.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/musb')
| -rw-r--r-- | drivers/usb/musb/musb_gadget.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index 176e1276dc28..f3ee04f2e17d 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -659,10 +659,11 @@ static void rxstate(struct musb *musb, struct musb_request *req) if (request->actual < request->length) { int transfer_size = 0; #ifdef USE_MODE1 - transfer_size = min(request->length, + transfer_size = min(request->length - request->actual, channel->max_len); #else - transfer_size = len; + transfer_size = min(request->length - request->actual, + (unsigned)len); #endif if (transfer_size <= musb_ep->packet_sz) musb_ep->dma->desired_mode = 0; |