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);