From: Alan Stern <stern@rowland.harvard.edu>
Date: Tue, 20 Dec 2005 14:58:08 +0000 (-0500)
Subject: [PATCH] UHCI: Don't log short transfers
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=dbf4fcad62467ce1bd6966292b6850fc7a210e0b;p=openwrt%2Fstaging%2Fblogic.git

[PATCH] UHCI: Don't log short transfers

Even when the URB_SHORT_NOT_OK flag is set, a short transfer shouldn't
generate a debugging log message.  Especially not one with the confusing
claim that the transfer "failed with status 0".  This patch (as627)
fixes that behavior in uhci-hcd.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c
index 5d6c4f75d0d8..0c1b12091c48 100644
--- a/drivers/usb/host/uhci-q.c
+++ b/drivers/usb/host/uhci-q.c
@@ -922,7 +922,6 @@ static int uhci_result_common(struct uhci_hcd *uhci, struct urb *urb)
 td_error:
 	ret = uhci_map_status(status, uhci_packetout(td_token(td)));
 
-err:
 	if ((debug == 1 && ret != -EPIPE) || debug > 1) {
 		/* Some debugging code */
 		dev_dbg(uhci_dev(uhci), "%s: failed with status %x\n",
@@ -934,6 +933,7 @@ err:
 			lprintk(errbuf);
 		}
 	}
+err:
 
 	/* Note that the queue has stopped and save the next toggle value */
 	urbp->qh->element = UHCI_PTR_TERM;