Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755590AbYHYLuA (ORCPT ); Mon, 25 Aug 2008 07:50:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754008AbYHYLtv (ORCPT ); Mon, 25 Aug 2008 07:49:51 -0400 Received: from smtp.nokia.com ([192.100.122.230]:32350 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753434AbYHYLtu (ORCPT ); Mon, 25 Aug 2008 07:49:50 -0400 Date: Mon, 25 Aug 2008 14:49:28 +0300 From: Felipe Balbi To: ext Bryan Wu Cc: felipe.balbi@nokia.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman Subject: Re: [PATCH 1/2] usb: musb: fix bug - don't mess up count number and CSR0 register value Message-ID: <20080825114928.GG20450@gandalf.research.nokia.com> Reply-To: felipe.balbi@nokia.com References: <1219655621-18510-1-git-send-email-cooloney@kernel.org> <1219655621-18510-2-git-send-email-cooloney@kernel.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Fba/0zbH8Xs+Fj9o" Content-Disposition: inline In-Reply-To: <1219655621-18510-2-git-send-email-cooloney@kernel.org> User-Agent: Mutt/1.5.17 (2007-11-01) X-OriginalArrivalTime: 25 Aug 2008 11:49:28.0218 (UTC) FILETIME=[A10017A0:01C906A8] X-Nokia-AV: Clean Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2885 Lines: 99 --Fba/0zbH8Xs+Fj9o Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --Fba/0zbH8Xs+Fj9o Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-usb-musb-do-not-mess-up-count-number-and-CSR0-regis.diff" >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: 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 --Fba/0zbH8Xs+Fj9o-- -- 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/