Re: 2.5.5-pre1 rmmod usb-uhci hangs

[Greg KH]

On Fri, Feb 15, 2002 at 03:54:40PM +0100, Pierre Rousselet wrote:
> with 2.5.5-pre1 usb-uhci module can't unload. rmmod hangs, leaving the 
> system unstable. in one circumstance the box freezed with an oops 
> involving swapper pid0 . this doesn't happen with 2.5.4

Try this (untested, I haven't rebooted yet) patch:

thanks,

greg k-h

diff -Nru a/drivers/usb/usb.c b/drivers/usb/usb.c
--- a/drivers/usb/usb.c	Thu Feb 14 22:47:21 2002
+++ b/drivers/usb/usb.c	Thu Feb 14 22:47:21 2002
@@ -1979,11 +1979,11 @@
 				if (driver->owner)
 					__MOD_DEC_USE_COUNT(driver->owner);
 				/* if driver->disconnect didn't release the interface */
-				if (interface->driver) {
-					put_device (&interface->dev);
+				if (interface->driver)
 					usb_driver_release_interface(driver, interface);
-				}
 			}
+			/* remove our device node for this interface */
+			put_device(&interface->dev);
 		}
 	}