Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 248783
b: refs/heads/master
c: 847ed3e
h: refs/heads/master
i:
  248781: 93ac666
  248779: fc220b6
  248775: d018a6e
  248767: f566378
v: v3
  • Loading branch information
Arvid Brodin authored and Greg Kroah-Hartman committed May 3, 2011
1 parent 9c55bdf commit da3bc08
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dfbc6fa3e1f19d31aeb6afdffeede7271e29bfbf
refs/heads/master: 847ed3e8f18b9cc401677e6e14eb7c89c7b8dfb6
11 changes: 5 additions & 6 deletions trunk/drivers/usb/host/isp1760-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit da3bc08

Please sign in to comment.