On Mon, Oct 01, 2001 at 11:37:50AM -0700, Greg KH wrote: > Hi all, > > In looking at the drivers/usb trees between 2.4.11-pre1 and 2.4.10-ac2, > I see a lot of differences. Some drivers are newer in one tree and not > the other and there are new files in the -ac tree.
For usb-uhci/uhci all of the changes (as far I can see) touch the uhci-common.h, which appeared and vanished again in 2.4.10-pre*. So I would consider Linus' version more up-to-date. But I miss my anti-crash fix for usb-uhci... Who is currently the (temporary/...) USB maintainer? I have attached it again, it should go in ASAP... -- Georg Acher, [EMAIL PROTECTED] http://www.in.tum.de/~acher/ "Oh no, not again !" The bowl of petunias
--- linux/drivers/usb/usb-uhci.c.org Thu Sep 27 12:12:39 2001 +++ linux/drivers/usb/usb-uhci.c Thu Sep 27 14:06:43 2001 @@ -2528,7 +2528,7 @@ int i; int ret = 0; urb_priv_t *urb_priv = urb->hcpriv; - struct list_head *p = urb_priv->desc_list.next; + struct list_head *p = urb_priv->desc_list.next, *p_tmp; uhci_desc_t *desc = list_entry (urb_priv->desc_list.prev, uhci_desc_t, desc_list); dbg("urb contains iso request"); @@ -2578,8 +2578,9 @@ dbg("process_iso: %i: len:%d %08x status:%x", i, urb->iso_frame_desc[i].actual_length, le32_to_cpu(desc->hw.td.status),urb->iso_frame_desc[i].status); - list_del (p); + p_tmp = p; p = p->next; + list_del (p_tmp); delete_desc (s, desc); }