[PATCH] Re: [linux-usb-devel] Re: [OOPS] reproducible oops with 2.6.5-rc2-bk3

[Colin Leroy <colin@colino.net>]

[-- Attachment #1: Type: text/plain, Size: 474 bytes --]

On 25 Mar 2004 at 11h03, Alan Stern wrote:

Hi, 

Found out !
cdc-acm wants both interfaces to be ready (cur_altsetting initialized) when acm_probe() is called. Hence, we have to make two parts out of the loop in message.c::usb_set_configuration(): one to init things, one to register them. 

The attached patch does that. It fixes the oops, and doesn't break any of my USB peripheral (printer, scanner, mouse, and diskonkey).

I hope it's fine enough to go in :)
-- 
Colin

[-- Attachment #2: cdc-acm.oops.patch --]
[-- Type: application/octet-stream, Size: 726 bytes --]

--- drivers/usb/core/message.c.orig	2004-03-25 18:34:04.000000000 +0100
+++ drivers/usb/core/message.c	2004-03-25 18:42:41.267697224 +0100
@@ -1178,10 +1178,17 @@
 				 dev->bus->busnum, dev->devpath,
 				 configuration,
 				 alt->desc.bInterfaceNumber);
+		}
+		
+		/* all interfaces are initialized, we can now 
+		 * register them
+		 */
+		for (i = 0; i < cp->desc.bNumInterfaces; ++i) {
+			struct usb_interface *intf = cp->interface[i];
 			dev_dbg (&dev->dev,
 				"registering %s (config #%d, interface %d)\n",
 				intf->dev.bus_id, configuration,
-				alt->desc.bInterfaceNumber);
+				intf->cur_altsetting->desc.bInterfaceNumber);
 			device_register (&intf->dev);
 			usb_create_driverfs_intf_files (intf);
 		}