From 0c7b882b68292f7f0961cf9512e286ff68cc7678 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Tue, 20 Dec 2005 09:58:08 -0500 Subject: [PATCH] --- yaml --- r: 22062 b: refs/heads/master c: dbf4fcad62467ce1bd6966292b6850fc7a210e0b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/uhci-q.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8cd1bdb51f61..c21c939ff5a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d402e1ae03656c1ad215514f8885ef4793f0948 +refs/heads/master: dbf4fcad62467ce1bd6966292b6850fc7a210e0b diff --git a/trunk/drivers/usb/host/uhci-q.c b/trunk/drivers/usb/host/uhci-q.c index 5d6c4f75d0d8..0c1b12091c48 100644 --- a/trunk/drivers/usb/host/uhci-q.c +++ b/trunk/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 @@ static int uhci_result_common(struct uhci_hcd *uhci, struct urb *urb) lprintk(errbuf); } } +err: /* Note that the queue has stopped and save the next toggle value */ urbp->qh->element = UHCI_PTR_TERM;