All of lore.kernel.org
 help / color / mirror / Atom feed
From: tom.leiming@gmail.com
To: greg@kroah.com
Cc: linux-usb@vger.kernel.org, linux-omap@vger.kernel.org,
	linux-kernel@vger.kernel.org, Ming Lei <tom.leiming@gmail.com>,
	David Brownell <dbrownell@users.sourceforge.net>,
	Felipe Balbi <me@felipebalbi.com>, Anand Gadiyar <gadiyar@ti.com>,
	Mike Frysinger <vapier@gentoo.org>,
	Sergei Shtylyov <sshtylyov@ru.mvista.com>
Subject: [RESEND/PATCH 4/6] USB: musb-gadget: fix DMA length for OUT transfer
Date: Tue,  7 Sep 2010 23:23:32 +0800	[thread overview]
Message-ID: <1283873014-32511-5-git-send-email-tom.leiming@gmail.com> (raw)
In-Reply-To: <1283873014-32511-1-git-send-email-tom.leiming@gmail.com>

From: Ming Lei <tom.leiming@gmail.com>

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: Felipe Balbi <me@felipebalbi.com>
Cc: Anand Gadiyar <gadiyar@ti.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
---
 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 176e127..f3ee04f 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;
-- 
1.6.2.5


WARNING: multiple messages have this Message-ID (diff)
From: tom.leiming-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
To: greg-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org
Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Ming Lei <tom.leiming-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
	David Brownell
	<dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>,
	Felipe Balbi <me-uiRdBs8odbtmTBlB0Cgj/Q@public.gmane.org>,
	Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>,
	Mike Frysinger <vapier-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>,
	Sergei Shtylyov
	<sshtylyov-hkdhdckH98+B+jHODAdFcQ@public.gmane.org>
Subject: [RESEND/PATCH 4/6] USB: musb-gadget: fix DMA length for OUT transfer
Date: Tue,  7 Sep 2010 23:23:32 +0800	[thread overview]
Message-ID: <1283873014-32511-5-git-send-email-tom.leiming@gmail.com> (raw)
In-Reply-To: <1283873014-32511-1-git-send-email-tom.leiming-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

From: Ming Lei <tom.leiming-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

DMA length should not go beyond the availabe space of request buffer,
so fix it.

Signed-off-by: Ming Lei <tom.leiming-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Acked-by:   Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>
Cc: David Brownell <dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
Cc: Felipe Balbi <me-uiRdBs8odbtmTBlB0Cgj/Q@public.gmane.org>
Cc: Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>
Cc: Mike Frysinger <vapier-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>
Cc: Sergei Shtylyov <sshtylyov-hkdhdckH98+B+jHODAdFcQ@public.gmane.org>
---
 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 176e127..f3ee04f 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;
-- 
1.6.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2010-09-07 15:25 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-07 15:23 [RESEND/PATCH 0/6] USB: musb-gadget: bug fix tom.leiming
2010-09-07 15:23 ` tom.leiming-Re5JQEeQqe8AvxtiuMwx3w
2010-09-07 15:23 ` [RESEND/PATCH 1/6] USB: musb-gadget: fix kernel panic if using out ep with FIFO_TXRX style(v1) tom.leiming
2010-09-07 15:23 ` [RESEND/PATCH 2/6] USB: musb-gadget: fix bulk IN infinite hangs in double buffer case tom.leiming
2010-09-07 15:23 ` [RESEND/PATCH 3/6] USB: musb-gadget: enable autoclear for OUT transfer in both DMA 0 and DMA 1 tom.leiming
2010-09-07 15:23 ` tom.leiming [this message]
2010-09-07 15:23   ` [RESEND/PATCH 4/6] USB: musb-gadget: fix DMA length for OUT transfer tom.leiming-Re5JQEeQqe8AvxtiuMwx3w
2010-09-07 15:23 ` [RESEND/PATCH 5/6] USB: musb-gadget: complete request only if data is transfered over tom.leiming
2010-09-07 15:23   ` tom.leiming-Re5JQEeQqe8AvxtiuMwx3w
2010-09-13 12:27   ` Sergei Shtylyov
2010-09-13 14:34     ` Ming Lei
2010-09-13 14:34       ` Ming Lei
2010-09-13 15:51       ` Sergei Shtylyov
2010-09-13 16:26         ` Sergei Shtylyov
2010-09-14  6:56           ` Felipe Balbi
2010-09-14 10:46             ` Sergei Shtylyov
2010-09-14 10:46               ` Sergei Shtylyov
2010-09-14 10:54               ` Felipe Balbi
2010-09-14 10:54                 ` Felipe Balbi
2010-09-14 17:51                 ` Sergei Shtylyov
2010-09-14 17:51                   ` Sergei Shtylyov
2010-09-15  6:53                   ` Felipe Balbi
2010-09-15  9:56                     ` Ming Lei
2010-09-15 10:01                     ` Sergei Shtylyov
2010-09-15 10:05                       ` Felipe Balbi
2010-09-15 10:08                         ` Sergei Shtylyov
2010-09-15 10:14                           ` Ming Lei
2010-09-15 10:18                             ` Sergei Shtylyov
2010-09-15 10:22                               ` Felipe Balbi
2010-09-15 10:22                                 ` Felipe Balbi
2010-09-15 10:27                                 ` Sergei Shtylyov
2010-09-15 10:27                                   ` Sergei Shtylyov
2010-09-15 10:31                                   ` Felipe Balbi
2010-09-15 10:41                                     ` Sergei Shtylyov
2010-09-15 10:52                                       ` Felipe Balbi
2010-09-15 13:02                                         ` Sergei Shtylyov
2010-09-15 10:37                                   ` Ming Lei
2010-09-07 15:23 ` [RESEND/PATCH 6/6] USB: musb-gadget: fix dma length in txstate tom.leiming
2010-09-07 15:23   ` tom.leiming-Re5JQEeQqe8AvxtiuMwx3w
2010-09-14 17:43   ` Sergei Shtylyov
2010-09-15  7:09     ` Felipe Balbi
2010-09-08  2:19 ` [RESEND/PATCH 0/6] USB: musb-gadget: bug fix Greg KH
2010-09-08  4:32   ` Ming Lei
2010-09-08  4:32     ` Ming Lei
2010-09-08  6:18     ` Greg KH
2010-09-08  6:18       ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1283873014-32511-5-git-send-email-tom.leiming@gmail.com \
    --to=tom.leiming@gmail.com \
    --cc=dbrownell@users.sourceforge.net \
    --cc=gadiyar@ti.com \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=me@felipebalbi.com \
    --cc=sshtylyov@ru.mvista.com \
    --cc=vapier@gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.