aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorrajaram <rajaram.ragupathy@stericsson.com>2011-04-26 10:48:21 +0530
committerSrinidhi KASAGAR <srinidhi.kasagar@stericsson.com>2011-04-26 08:06:00 +0200
commit0e294e49afbb95aae5d4f9418d3bd6d061e3d47e (patch)
treed45f9a4d8c930a26d75ddbf454215c09abdcdbfb /drivers/usb
parentcbe7e71af8a8b68acb650f06874c0b4feed7817f (diff)
musb : compiler error during PIO mode
Fixes build error in musb_gadget.c ST-Ericsson ID: 336827 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: NA Change-Id: I30ab6a2612f2f4970f32898f92181b704668feae Signed-off-by: rajaram <rajaram.ragupathy@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21550 Reviewed-by: Praveena NADAHALLY <praveen.nadahally@stericsson.com> Tested-by: Rajaram REGUPATHY <ragupathy.rajaram@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: QATEST Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/musb/musb_gadget.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 4527776cb69..bcabf84716c 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -704,13 +704,14 @@ static void rxstate(struct musb *musb, struct musb_request *req)
if (csr & MUSB_RXCSR_RXPKTRDY) {
len = musb_readw(epio, MUSB_RXCOUNT);
if (request->actual < request->length) {
+#if defined(CONFIG_USB_INVENTRA_DMA) || defined(CONFIG_USB_U8500_DMA)
+
#ifdef CONFIG_USB_INVENTRA_DMA
if (is_dma_capable() && musb_ep->dma) {
#else
if (is_buffer_mapped(req) &&
(len >= DMA_PACKET_THRESHOLD)) {
#endif
-#if defined(CONFIG_USB_INVENTRA_DMA) || defined(CONFIG_USB_U8500_DMA)
struct dma_controller *c;
struct dma_channel *channel;
int use_dma = 0;