From 5ec447d9c9b60a52dda2231c0b699c90db3298fb Mon Sep 17 00:00:00 2001 From: Ajay Kumar Gupta Date: Mon, 22 Nov 2010 14:22:41 +0530 Subject: [PATCH] --- yaml --- r: 222819 b: refs/heads/master c: bb324b08165d5656d221af013ed9994a54e455be h: refs/heads/master i: 222817: d79fd201c1fb168a5368b0ad1da15a4ef6c8ac51 222815: bff98234f65afa5b86be6f799504d855a953f4eb v: v3 --- [refs] | 2 +- trunk/drivers/usb/musb/musb_gadget.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1aa9c753a84a..fcb21fd65520 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e75df37165c639b06213ec88b4763c3e50a7f079 +refs/heads/master: bb324b08165d5656d221af013ed9994a54e455be diff --git a/trunk/drivers/usb/musb/musb_gadget.c b/trunk/drivers/usb/musb/musb_gadget.c index 363cfad003f8..c8de0e123f2c 100644 --- a/trunk/drivers/usb/musb/musb_gadget.c +++ b/trunk/drivers/usb/musb/musb_gadget.c @@ -896,7 +896,9 @@ void musb_g_rx(struct musb *musb, u8 epnum) if (!request) return; } +#if defined(CONFIG_USB_INVENTRA_DMA) || defined(CONFIG_USB_TUSB_OMAP_DMA) exit: +#endif /* Analyze request */ rxstate(musb, to_musb_request(request)); }