From 11fdd82108886f06554242c7ca040249ed2d430f Mon Sep 17 00:00:00 2001 From: Sarah Sharp Date: Tue, 25 Oct 2011 13:55:30 +0200 Subject: [PATCH] --- yaml --- r: 280943 b: refs/heads/master c: 2a9227a5eeaeb3f91e3a72ceea4fa59016ca5d20 h: refs/heads/master i: 280941: bcba2bb8d8adbe0a335953b643770b540bb8e819 280939: f54660a0badfbc3ea2a2d26fed6473c489555576 280935: d89a1f4e21c7923fa56f728db214793330101ac5 280927: 1cf0113c1037ba789781ae66ce0d45eb033bd2ca v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/xhci-ring.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 18bb7782ae9b..d8c00cc8c8ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 051031143544ff196d94927be8f384864fbca6a4 +refs/heads/master: 2a9227a5eeaeb3f91e3a72ceea4fa59016ca5d20 diff --git a/trunk/drivers/usb/host/xhci-ring.c b/trunk/drivers/usb/host/xhci-ring.c index d030f0b2bfa2..560b7d7ff0c6 100644 --- a/trunk/drivers/usb/host/xhci-ring.c +++ b/trunk/drivers/usb/host/xhci-ring.c @@ -1643,7 +1643,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 @@ -1985,7 +1984,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; @@ -1995,11 +1994,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: