Revert "usb: msm7k_udc: Add delay upon request dequeue failure"
This reverts commit 0039568714ab91b2e037ea84366231522ee7ca07.
Reverting this commit due to the following reasons
1. Throughputs numbers on the DUN interface has degraded with this change
2. Data stall issue that was fixed with this change is occuring only on
agilent setup and not reproducible on BOA setup.
3. Issue 1 is identified as critical than Issue 2.
Conflicts:
drivers/usb/gadget/msm72k_udc.c
CRs-Fixed: 334938
Change-Id: I1cc745a3bebe6f6b97b170138b4643db50b7e516
Signed-off-by: Chiranjeevi Velempati <cvelempa@codeaurora.org>
diff --git a/drivers/usb/gadget/msm72k_udc.c b/drivers/usb/gadget/msm72k_udc.c
index 28e217b..e0fc12c 100644
--- a/drivers/usb/gadget/msm72k_udc.c
+++ b/drivers/usb/gadget/msm72k_udc.c
@@ -2,7 +2,7 @@
* Driver for HighSpeed USB Client Controller in MSM7K
*
* Copyright (C) 2008 Google, Inc.
- * Copyright (c) 2009-2011, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2009-2012, Code Aurora Forum. All rights reserved.
* Author: Mike Lockwood <lockwood@android.com>
* Brian Swetland <swetland@google.com>
*
@@ -1109,7 +1109,6 @@
struct msm_endpoint *ept = ui->ept + bit;
struct msm_request *req;
unsigned long flags;
- int req_dequeue = 1;
unsigned info;
/*
@@ -1129,23 +1128,12 @@
break;
}
-dequeue:
/* clean speculative fetches on req->item->info */
dma_coherent_post_ops();
info = req->item->info;
/* if the transaction is still in-flight, stop here */
- if (info & INFO_ACTIVE) {
- if (req_dequeue) {
- req_dequeue = 0;
- ui->dTD_update_fail_count++;
- ept->dTD_update_fail_count++;
- udelay(10);
- goto dequeue;
- } else {
- break;
- }
- }
- req_dequeue = 0;
+ if (info & INFO_ACTIVE)
+ break;
del_timer(&ept->prime_timer);
/* advance ept queue to the next request */