Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f5ef2abcbeb5b0be23f7cc610a024b2406e3d8e6
Commit:     f5ef2abcbeb5b0be23f7cc610a024b2406e3d8e6
Parent:     755948cfca16c71b16e8ff4a9d4dd31b1c0bf923
Author:     Linus Torvalds <[EMAIL PROTECTED]>
AuthorDate: Sun Apr 1 10:54:13 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sun Apr 1 10:54:13 2007 -0700

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/base/driver.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 1214cbd..082bfde 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);
 }
 
 /**
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to