From da3bc08c63d2324ce89ca263f7a493361c59642d Mon Sep 17 00:00:00 2001
From: Arvid Brodin <arvid.brodin@enea.com>
Date: Tue, 26 Apr 2011 21:47:12 +0200
Subject: [PATCH] --- yaml --- r: 248783 b: refs/heads/master c:
 847ed3e8f18b9cc401677e6e14eb7c89c7b8dfb6 h: refs/heads/master i:   248781:
 93ac666576df35e10bac385655eb94caa79bf553   248779:
 fc220b64e2234ca13de6b4810c648adf4abc87d3   248775:
 d018a6e71958af32f5b271c1d3eb169e3294eb38   248767:
 f56637844c6b60a369881017f07d879b3afebc4a v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/usb/host/isp1760-hcd.c | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 116388e8de1c..20a5ffa8e81b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfbc6fa3e1f19d31aeb6afdffeede7271e29bfbf
+refs/heads/master: 847ed3e8f18b9cc401677e6e14eb7c89c7b8dfb6
diff --git a/trunk/drivers/usb/host/isp1760-hcd.c b/trunk/drivers/usb/host/isp1760-hcd.c
index 795345ad45e6..ff3b3165d19d 100644
--- a/trunk/drivers/usb/host/isp1760-hcd.c
+++ b/trunk/drivers/usb/host/isp1760-hcd.c
@@ -1021,10 +1021,10 @@ static void do_atl_int(struct usb_hcd *hcd)
 		qtd = priv->atl_ints[slot].qtd;
 		qh = priv->atl_ints[slot].qh;
 
-		if (!qh) {
-			dev_err(hcd->self.controller, "qh is 0\n");
+		/* urb unlinked? */
+		if (!qh)
 			continue;
-		}
+
 		ptd_read(hcd->regs, ATL_PTD_OFFSET, slot, &ptd);
 
 		rl = (ptd.dw2 >> 25) & 0x0f;
@@ -1213,10 +1213,9 @@ static void do_intl_int(struct usb_hcd *hcd)
 		qtd = priv->int_ints[slot].qtd;
 		qh = priv->int_ints[slot].qh;
 
-		if (!qh) {
-			dev_err(hcd->self.controller, "(INT) qh is 0\n");
+		/* urb unlinked? */
+		if (!qh)
 			continue;
-		}
 
 		ptd_read(hcd->regs, INT_PTD_OFFSET, slot, &ptd);
 		check_int_err_status(hcd, ptd.dw4);