Changeset 5433

Timestamp:

11/26/08 15:52:07 (1 month ago)

Author:

khali

Message:

Unload kernel drivers which we loaded ourselves when we are done with them.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/CHANGES (modified) (1 diff)
• lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect (modified) (5 diffs)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -26 +26 @@
-                  Improve GL525SM detection a bit
-                  Let kernel 2.6.28 and later handle chips aliases
+                  Unload kernel drivers when we are done with them (#2329)
-
-3.0.3 (2008-09-28)

lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect

@@ -2291 +2291 @@
-###########
-
-
+ @modules_we_loaded
-
-sub initialize_modules_list
@@ -2308 +2308 @@
-    $modules_supported{$chip->{driver}}++;
-  }
+}
+
+sub unload_modules
+{
+        return unless @modules_we_loaded;
+
+        # Attempt to unload all kernel drivers we loaded ourselves
+        while (my $module = pop @modules_we_loaded) {
+                print "Unloading $module... ";
+                system("modprobe -r $module 2> /dev/null");
+                if (($? >> 8) == 0) {
+                        print "OK\n";
+                } else {
+                        print "failed\n";
+                }
+        }
+        print "\n";
-}
-
@@ -5338 +5355 @@
-          } else {
-            print "Module loaded successfully.\n";
+            push @modules_we_loaded, $adapter;
+            $modules_list{$adapter} = 1;
-          }
-        }
@@ -5357 +5376 @@
-    } else {
-      print "Module loaded successfully.\n";
+      push @modules_we_loaded, "i2c-dev";
+      $modules_list{"i2c-dev"} = 1;
-    }
-    print "\n";
@@ -5590 +5611 @@
-          "modules are loaded.\n\n";
-  }
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-main;