aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorArvid Brodin <arvid.brodin@enea.com>2011-04-26 15:47:12 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-02 20:02:54 -0400
commit847ed3e8f18b9cc401677e6e14eb7c89c7b8dfb6 (patch)
tree478afb3d83bb85df344ce34c879dcddc234b29db /drivers
parentdfbc6fa3e1f19d31aeb6afdffeede7271e29bfbf (diff)
usb/isp1760: Remove false error printout
This removes the "qh is 0" printout. qh == NULL if the urb has been unlinked, so this condition is normal. Signed-off-by: Arvid Brodin <arvid.brodin@enea.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/host/isp1760-hcd.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index 795345ad45e6..ff3b3165d19d 100644
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
@@ -1021,10 +1021,10 @@ static void do_atl_int(struct usb_hcd *hcd)
1021 qtd = priv->atl_ints[slot].qtd; 1021 qtd = priv->atl_ints[slot].qtd;
1022 qh = priv->atl_ints[slot].qh; 1022 qh = priv->atl_ints[slot].qh;
1023 1023
1024 if (!qh) { 1024 /* urb unlinked? */
1025 dev_err(hcd->self.controller, "qh is 0\n"); 1025 if (!qh)
1026 continue; 1026 continue;
1027 } 1027
1028 ptd_read(hcd->regs, ATL_PTD_OFFSET, slot, &ptd); 1028 ptd_read(hcd->regs, ATL_PTD_OFFSET, slot, &ptd);
1029 1029
1030 rl = (ptd.dw2 >> 25) & 0x0f; 1030 rl = (ptd.dw2 >> 25) & 0x0f;
@@ -1213,10 +1213,9 @@ static void do_intl_int(struct usb_hcd *hcd)
1213 qtd = priv->int_ints[slot].qtd; 1213 qtd = priv->int_ints[slot].qtd;
1214 qh = priv->int_ints[slot].qh; 1214 qh = priv->int_ints[slot].qh;
1215 1215
1216 if (!qh) { 1216 /* urb unlinked? */
1217 dev_err(hcd->self.controller, "(INT) qh is 0\n"); 1217 if (!qh)
1218 continue; 1218 continue;
1219 }
1220 1219
1221 ptd_read(hcd->regs, INT_PTD_OFFSET, slot, &ptd); 1220 ptd_read(hcd->regs, INT_PTD_OFFSET, slot, &ptd);
1222 check_int_err_status(hcd, ptd.dw4); 1221 check_int_err_status(hcd, ptd.dw4);