Patchwork [1/1] Revert "EHCI: Update qTD next pointer in QH overlay region during unlink"

login
register
mail settings
Submitter Joseph Salisbury
Date Jan. 17, 2013, 6:49 p.m.
Message ID <279af1783b56daad35b0bc8da73d4ad175296556.1358447866.git.joseph.salisbury@canonical.com>
Download mbox | patch
Permalink /patch/213347/
State New
Headers show

Comments

Joseph Salisbury - Jan. 17, 2013, 6:49 p.m.
From: Joseph Salisbury <joseph.salisbury@canonical.com>

BugLink: http://bugs.launchpad.net/bugs/1088733

This reverts commit 1cef533d4e688acbf048b5b32e6f3ca9a265ed4e.
---
 drivers/usb/host/ehci-q.c |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

Patch

diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 2023733..fef1db3 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -128,17 +128,9 @@  qh_refresh (struct ehci_hcd *ehci, struct ehci_qh *qh)
 	else {
 		qtd = list_entry (qh->qtd_list.next,
 				struct ehci_qtd, qtd_list);
-		/*
-		 * first qtd may already be partially processed.
-		 * If we come here during unlink, the QH overlay region
-		 * might have reference to the just unlinked qtd. The
-		 * qtd is updated in qh_completions(). Update the QH
-		 * overlay here.
-		 */
-		if (cpu_to_hc32(ehci, qtd->qtd_dma) == qh->hw->hw_current) {
-			qh->hw->hw_qtd_next = qtd->hw_next;
+		/* first qtd may already be partially processed */
+		if (cpu_to_hc32(ehci, qtd->qtd_dma) == qh->hw->hw_current)
 			qtd = NULL;
-		}
 	}
 
 	if (qtd)