From: Linus Torvalds Date: Sun, 1 Apr 2007 17:54:13 +0000 (-0700) Subject: driver core: do not wait unnecessarily in driver_unregister() X-Git-Tag: v2.6.21-rc6~39 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f5ef2abcbeb5b0be23f7cc610a024b2406e3d8e6;p=linux-2.6-omap-h63xx.git driver core: do not wait unnecessarily in driver_unregister() Ingo reported that built-in drivers suffered bootup hangs with certain driver unregistry sequences, due to sysfs breakage. Do the minimal fix for v2.6.21: only wait if the driver is a module. Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds --- diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 1214cbd17d8..082bfded385 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -183,7 +183,14 @@ int driver_register(struct device_driver * drv) void driver_unregister(struct device_driver * drv) { bus_remove_driver(drv); - wait_for_completion(&drv->unloaded); + /* + * If the driver is a module, we are probably in + * the module unload path, and we want to wait + * for everything to unload before we can actually + * finish the unload. + */ + if (drv->owner) + wait_for_completion(&drv->unloaded); } /**