From patchwork Mon Feb 21 12:59:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Jones X-Patchwork-Id: 577461 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1LD8f4K014467 for ; Mon, 21 Feb 2011 13:08:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755807Ab1BUNIl (ORCPT ); Mon, 21 Feb 2011 08:08:41 -0500 Received: from mail2.matrix-vision.com ([85.214.244.251]:54152 "EHLO mail2.matrix-vision.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755659Ab1BUNIk (ORCPT ); Mon, 21 Feb 2011 08:08:40 -0500 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 21 Feb 2011 13:08:43 +0000 (UTC) X-Greylist: delayed 526 seconds by postgrey-1.27 at vger.kernel.org; Mon, 21 Feb 2011 08:08:40 EST Received: from mail2.matrix-vision.com (localhost [127.0.0.1]) by mail2.matrix-vision.com (Postfix) with ESMTP id 933654142C; Mon, 21 Feb 2011 13:59:53 +0100 (CET) Received: from erinome (g2.matrix-vision.com [80.152.136.245]) by mail2.matrix-vision.com (Postfix) with ESMTPA id 48642413F1; Mon, 21 Feb 2011 13:59:53 +0100 (CET) Received: from erinome (localhost [127.0.0.1]) by erinome (Postfix) with ESMTP id AC0626F8A; Mon, 21 Feb 2011 13:59:52 +0100 (CET) Received: by erinome (Postfix, from userid 108) id A14F26F9C; Mon, 21 Feb 2011 13:59:52 +0100 (CET) Received: from [192.168.65.46] (host65-46.intern.matrix-vision.de [192.168.65.46]) by erinome (Postfix) with ESMTPA id 8FD006F8A; Mon, 21 Feb 2011 13:59:52 +0100 (CET) Message-ID: <4D6261C8.1090605@matrix-vision.de> Date: Mon, 21 Feb 2011 13:59:52 +0100 From: Michael Jones User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.12) Gecko/20101029 Lightning/1.0b2 Thunderbird/3.1.6 MIME-Version: 1.0 To: balbi@ti.com CC: linux-omap@vger.kernel.org Subject: double_buffer_not_ok compile error X-MV-Disclaimer: true (erinome) X-AV-Checked: ClamAV using ClamSMTP (erinome) X-AV-Checked: ClamAV using ClamSMTP (mail2) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index 0f523d7..809965f 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -609,9 +609,11 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, struct musb_hw_ep *ep) /* Set RXMAXP with the FIFO size of the endpoint * to disable double buffer mode. */ +#ifdef CONFIG_USB_GADGET_MUSB_HDRC if (musb->double_buffer_not_ok) musb_writew(ep->regs, MUSB_RXMAXP, ep->max_packet_sz_rx); else +#endif musb_writew(ep->regs, MUSB_RXMAXP, qh->maxpacket | ((qh->hb_mult - 1) << 11)); @@ -784,10 +786,12 @@ static void musb_ep_program(struct musb *musb, u8 epnum, /* protocol/endpoint/interval/NAKlimit */ if (epnum) { musb_writeb(epio, MUSB_TXTYPE, qh->type_reg); +#ifdef CONFIG_USB_GADGET_MUSB_HDRC if (musb->double_buffer_not_ok) musb_writew(epio, MUSB_TXMAXP, hw_ep->max_packet_sz_tx); else +#endif musb_writew(epio, MUSB_TXMAXP, qh->maxpacket | ((qh->hb_mult - 1) << 11));