Commit 135c5b70 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman

[PATCH] USB: ohci-hcd fewer diagnostics

This gets rid of some potentially scarey messages I've recently
seen on disconnect, "bad hash" for a TD ... it's really a "no hash"
case, and this prevents the message in some cases where that's
not an issue.  Likely this is what Gary Gorgen noticed, but even
he had a different problem, this message shouldn't always appear.

It also slims down one other message, preventing it from appearing
in the routine "protocol stall" case (and cluttering logfiles).
parent c9684e5e
...@@ -115,8 +115,8 @@ td_free (struct ohci_hcd *hc, struct td *td) ...@@ -115,8 +115,8 @@ td_free (struct ohci_hcd *hc, struct td *td)
prev = &(*prev)->td_hash; prev = &(*prev)->td_hash;
if (*prev) if (*prev)
*prev = td->td_hash; *prev = td->td_hash;
else else if ((td->hwINFO & TD_DONE) != 0)
ohci_dbg (hc, "bad hash for td %p\n", td); ohci_dbg (hc, "no hash for td %p\n", td);
pci_pool_free (hc->td_cache, td, td->td_dma); pci_pool_free (hc->td_cache, td, td->td_dma);
} }
......
...@@ -783,14 +783,18 @@ ed_halted (struct ohci_hcd *ohci, struct td *td, int cc, struct td *rev) ...@@ -783,14 +783,18 @@ ed_halted (struct ohci_hcd *ohci, struct td *td, int cc, struct td *rev)
ed->hwHeadP = next->hwNextTD | toggle; ed->hwHeadP = next->hwNextTD | toggle;
} }
/* help for troubleshooting: */ /* help for troubleshooting: report anything that
ohci_dbg (ohci, * looks odd ... that doesn't include protocol stalls
"urb %p usb-%s-%s ep-%d-%s cc %d --> status %d\n", * (or maybe some other things)
urb, */
urb->dev->bus->bus_name, urb->dev->devpath, if (cc != TD_CC_STALL || !usb_pipecontrol (urb->pipe))
usb_pipeendpoint (urb->pipe), ohci_dbg (ohci,
usb_pipein (urb->pipe) ? "IN" : "OUT", "urb %p path %s ep%d%s %08x cc %d --> status %d\n",
cc, cc_to_error [cc]); urb, urb->dev->devpath,
usb_pipeendpoint (urb->pipe),
usb_pipein (urb->pipe) ? "in" : "out",
le32_to_cpu (td->hwINFO),
cc, cc_to_error [cc]);
return rev; return rev;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment