On Mon, Oct 14, 2002, Chris Cheney <[EMAIL PROTECTED]> wrote:
> It appears that a usb merge went into 2.5.42-bk2 however I still get
> this oops on boot (which hangs the system).
-bk2?
I've sent a patch off to Greg that should fix this problem. I don't know
if it has been merged into his BK tree yet.
I've attached it for you. The path is from Dan Streetman.
JE
# This is a BitKeeper generated patch for the following project:
# Project Name: greg k-h's linux 2.5 USB kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.892 -> 1.893
# drivers/usb/host/uhci-hcd.c 1.25 -> 1.26
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/13 johannes@devel.(none) 1.893
# uhci-hcd.c:
# If we fail adding the URB to the schedule, we need to make
# sure that we remove it from the urb_list. Thanks to
# Dan Streetman for finding and fixing this bug.
# --------------------------------------------
#
diff -Nru a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
--- a/drivers/usb/host/uhci-hcd.c Sun Oct 13 18:11:20 2002
+++ b/drivers/usb/host/uhci-hcd.c Sun Oct 13 18:11:20 2002
@@ -1496,12 +1496,19 @@
break;
}
- spin_unlock_irqrestore(&uhci->urb_list_lock, flags);
-
if (ret != -EINPROGRESS) {
+ /* Submit failed, so delete it from the urb_list */
+ struct urb_priv *urbp = urb->hcpriv;
+
+ list_del_init(&urbp->urb_list);
+ spin_unlock_irqrestore(&uhci->urb_list_lock, flags);
uhci_destroy_urb_priv (uhci, urb);
+
return ret;
}
+
+ spin_unlock_irqrestore(&uhci->urb_list_lock, flags);
+
return 0;
}
