Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755859AbYHYOdi (ORCPT ); Mon, 25 Aug 2008 10:33:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753097AbYHYOd2 (ORCPT ); Mon, 25 Aug 2008 10:33:28 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:37345 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753336AbYHYOd1 convert rfc822-to-8bit (ORCPT ); Mon, 25 Aug 2008 10:33:27 -0400 From: "Gadiyar, Anand" To: "felipe.balbi@nokia.com" CC: ext Bryan Wu , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Greg Kroah-Hartman Date: Mon, 25 Aug 2008 20:03:06 +0530 Subject: RE: [PATCH 1/2] usb: musb: fix bug - don't mess up count number and CSR0 register value Thread-Topic: [PATCH 1/2] usb: musb: fix bug - don't mess up count number and CSR0 register value Thread-Index: AckGvyZZ7ay6pAKjQsaz1yntjF14HgAADpXg Message-ID: <5A47E75E594F054BAF48C5E4FC4B92AB02C40F50B2@dbde02.ent.ti.com> References: <1219655621-18510-1-git-send-email-cooloney@kernel.org> <1219655621-18510-2-git-send-email-cooloney@kernel.org> <20080825114928.GG20450@gandalf.research.nokia.com> <20080825142852.GK20450@gandalf.research.nokia.com> In-Reply-To: <20080825142852.GK20450@gandalf.research.nokia.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3097 Lines: 94 > On Mon, Aug 25, 2008 at 02:49:28PM +0300, Felipe Balbi wrote: > > On Mon, Aug 25, 2008 at 05:13:40PM +0800, ext Bryan Wu wrote: > > > Signed-off-by: Bryan Wu > > > > This patch looks ok, but doesn't apply on top of the > previous series. > > > > Greg, please apply the refreshed version attached. > > > > thanks, > > -- > > balbi > > > >From efae64b5f222e1b57b354e8207c62975c5a7618b Mon Sep 17 00:00:00 2001 > > From: Bryan Wu > > Date: Mon, 25 Aug 2008 14:39:39 +0300 > > Subject: [PATCH] usb: musb: do not mess up count number and CSR0 register value > > > Signed-off-by: Bryan Wy Signed-off-by: Bryan Wu > > Signed-off-by: Felipe Balbi > > --- > > drivers/usb/musb/musb_gadget_ep0.c | 24 ++++++++++++------------ > > 1 files changed, 12 insertions(+), 12 deletions(-) > > > > diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c > > index b50a30d..9b59824 100644 > > --- a/drivers/usb/musb/musb_gadget_ep0.c > > +++ b/drivers/usb/musb/musb_gadget_ep0.c > > @@ -437,7 +437,7 @@ static void ep0_rxstate(struct musb *musb) > > { > > void __iomem *regs = musb->control_ep->regs; > > struct usb_request *req; > > - u16 tmp; > > + u16 count, csr; > > > > req = next_ep0_request(musb); > > > > @@ -449,34 +449,34 @@ static void ep0_rxstate(struct musb *musb) > > unsigned len = req->length - req->actual; > > > > /* read the buffer */ > > - tmp = musb_readb(regs, MUSB_COUNT0); > > - if (tmp > len) { > > + count = musb_readb(regs, MUSB_COUNT0); > > + if (count > len) { > > req->status = -EOVERFLOW; > > - tmp = len; > > + count = len; > > } > > - musb_read_fifo(&musb->endpoints[0], tmp, buf); > > - req->actual += tmp; > > - tmp = MUSB_CSR0_P_SVDRXPKTRDY; > > - if (tmp < 64 || req->actual == req->length) { > > + musb_read_fifo(&musb->endpoints[0], count, buf); > > + req->actual += count; > > + csr = MUSB_CSR0_P_SVDRXPKTRDY; > > + if (count < 64 || req->actual == req->length) { > > musb->ep0_state = MUSB_EP0_STAGE_STATUSIN; > > - tmp |= MUSB_CSR0_P_DATAEND; > > + csr |= MUSB_CSR0_P_DATAEND; > > } else > > req = NULL; > > } else > > - tmp = MUSB_CSR0_P_SVDRXPKTRDY | MUSB_CSR0_P_SENDSTALL; > > + csr = MUSB_CSR0_P_SVDRXPKTRDY | MUSB_CSR0_P_SENDSTALL; > > > > > > /* Completion handler may choose to stall, e.g. because the > > * message just received holds invalid data. > > */ > > if (req) { > > - musb->ackpend = tmp; > > + musb->ackpend = csr; > > musb_g_ep0_giveback(musb, req); > > if (!musb->ackpend) > > return; > > musb->ackpend = 0; > > } > > - musb_writew(regs, MUSB_CSR0, tmp); > > + musb_writew(regs, MUSB_CSR0, csr); > > } > > > > /* > > -- > > 1.6.0.rc1.71.gfba5 > > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/