Message ID | 43bd06b72f132f1ea1d4e824bc42d4a799a2f943.1328816413.git.leann.ogasawara@canonical.com |
---|---|
State | New |
Headers | show |
On 02/09/2012 12:46 PM, leann.ogasawara@canonical.com wrote: > From: Sarah Sharp<sarah.a.sharp@linux.intel.com> > > BugLink: http://bugs.launchpad.net/bugs/929656 > > Getting a short packet or a babble error is usually a recoverable error, > so stop scaring users with warnings in dmesg when xHCI debugging is turned > off. > > Signed-off-by: Sarah Sharp<sarah.a.sharp@linux.intel.com> > (cherry picked from commit 2a9227a5eeaeb3f91e3a72ceea4fa59016ca5d20) > > Signed-off-by: Leann Ogasawara<leann.ogasawara@canonical.com> > --- > drivers/usb/host/xhci-ring.c | 7 +++---- > 1 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c > index edcedc4..8c8888f 100644 > --- a/drivers/usb/host/xhci-ring.c > +++ b/drivers/usb/host/xhci-ring.c > @@ -1648,7 +1648,6 @@ static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td, > } > break; > case COMP_SHORT_TX: > - xhci_warn(xhci, "WARN: short transfer on control ep\n"); > if (td->urb->transfer_flags& URB_SHORT_NOT_OK) > *status = -EREMOTEIO; > else > @@ -1994,7 +1993,7 @@ static int handle_tx_event(struct xhci_hcd *xhci, > xhci_dbg(xhci, "Stopped on No-op or Link TRB\n"); > break; > case COMP_STALL: > - xhci_warn(xhci, "WARN: Stalled endpoint\n"); > + xhci_dbg(xhci, "Stalled endpoint\n"); > ep->ep_state |= EP_HALTED; > status = -EPIPE; > break; > @@ -2004,11 +2003,11 @@ static int handle_tx_event(struct xhci_hcd *xhci, > break; > case COMP_SPLIT_ERR: > case COMP_TX_ERR: > - xhci_warn(xhci, "WARN: transfer error on endpoint\n"); > + xhci_dbg(xhci, "Transfer error on endpoint\n"); > status = -EPROTO; > break; > case COMP_BABBLE: > - xhci_warn(xhci, "WARN: babble error on endpoint\n"); > + xhci_dbg(xhci, "Babble error on endpoint\n"); > status = -EOVERFLOW; > break; > case COMP_DB_ERR:
On 09/02/12 20:46, leann.ogasawara@canonical.com wrote: > From: Sarah Sharp<sarah.a.sharp@linux.intel.com> > > BugLink: http://bugs.launchpad.net/bugs/929656 > > Getting a short packet or a babble error is usually a recoverable error, > so stop scaring users with warnings in dmesg when xHCI debugging is turned > off. > > Signed-off-by: Sarah Sharp<sarah.a.sharp@linux.intel.com> > (cherry picked from commit 2a9227a5eeaeb3f91e3a72ceea4fa59016ca5d20) > > Signed-off-by: Leann Ogasawara<leann.ogasawara@canonical.com> > --- > drivers/usb/host/xhci-ring.c | 7 +++---- > 1 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c > index edcedc4..8c8888f 100644 > --- a/drivers/usb/host/xhci-ring.c > +++ b/drivers/usb/host/xhci-ring.c > @@ -1648,7 +1648,6 @@ static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td, > } > break; > case COMP_SHORT_TX: > - xhci_warn(xhci, "WARN: short transfer on control ep\n"); > if (td->urb->transfer_flags& URB_SHORT_NOT_OK) > *status = -EREMOTEIO; > else > @@ -1994,7 +1993,7 @@ static int handle_tx_event(struct xhci_hcd *xhci, > xhci_dbg(xhci, "Stopped on No-op or Link TRB\n"); > break; > case COMP_STALL: > - xhci_warn(xhci, "WARN: Stalled endpoint\n"); > + xhci_dbg(xhci, "Stalled endpoint\n"); > ep->ep_state |= EP_HALTED; > status = -EPIPE; > break; > @@ -2004,11 +2003,11 @@ static int handle_tx_event(struct xhci_hcd *xhci, > break; > case COMP_SPLIT_ERR: > case COMP_TX_ERR: > - xhci_warn(xhci, "WARN: transfer error on endpoint\n"); > + xhci_dbg(xhci, "Transfer error on endpoint\n"); > status = -EPROTO; > break; > case COMP_BABBLE: > - xhci_warn(xhci, "WARN: babble error on endpoint\n"); > + xhci_dbg(xhci, "Babble error on endpoint\n"); > status = -EOVERFLOW; > break; > case COMP_DB_ERR: Acked-by: Colin King <colin.king@canonical.com>
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index edcedc4..8c8888f 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1648,7 +1648,6 @@ static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td, } break; case COMP_SHORT_TX: - xhci_warn(xhci, "WARN: short transfer on control ep\n"); if (td->urb->transfer_flags & URB_SHORT_NOT_OK) *status = -EREMOTEIO; else @@ -1994,7 +1993,7 @@ static int handle_tx_event(struct xhci_hcd *xhci, xhci_dbg(xhci, "Stopped on No-op or Link TRB\n"); break; case COMP_STALL: - xhci_warn(xhci, "WARN: Stalled endpoint\n"); + xhci_dbg(xhci, "Stalled endpoint\n"); ep->ep_state |= EP_HALTED; status = -EPIPE; break; @@ -2004,11 +2003,11 @@ static int handle_tx_event(struct xhci_hcd *xhci, break; case COMP_SPLIT_ERR: case COMP_TX_ERR: - xhci_warn(xhci, "WARN: transfer error on endpoint\n"); + xhci_dbg(xhci, "Transfer error on endpoint\n"); status = -EPROTO; break; case COMP_BABBLE: - xhci_warn(xhci, "WARN: babble error on endpoint\n"); + xhci_dbg(xhci, "Babble error on endpoint\n"); status = -EOVERFLOW; break; case COMP_DB_ERR: