hwmon it87 oops on removal fix from Jean Delvare

diff --git a/queue/it87-fix-oops-on-removal.patch b/queue/it87-fix-oops-on-removal.patch
new file mode 100644 (file)
index 0000000..25220a4
--- /dev/null
+++ b/queue/it87-fix-oops-on-removal.patch
@@ -0,0 +1,30 @@
+From stable-bounces@linux.kernel.org  Mon Feb 20 00:58:52 2006
+Date: Sun, 19 Feb 2006 15:18:04 +0100
+From: Jean Delvare <khali@linux-fr.org>
+To: stable@kernel.org
+Cc: 
+Subject: [PATCH] it87: Fix oops on removal
+
+Fix an oops on it87 module removal when no supported hardware was
+found.
+
+Signed-off-by: Jean Delvare <khali@linux-fr.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ drivers/hwmon/it87.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletion(-)
+
+--- linux-2.6.15.4.orig/drivers/hwmon/it87.c
++++ linux-2.6.15.4/drivers/hwmon/it87.c
+@@ -1180,7 +1180,8 @@ static int __init sm_it87_init(void)
+ 
+ static void __exit sm_it87_exit(void)
+ {
+-      i2c_isa_del_driver(&it87_isa_driver);
++      if (isa_address)
++              i2c_isa_del_driver(&it87_isa_driver);
+       i2c_del_driver(&it87_driver);
+ }
+ 

diff --git a/queue/series b/queue/series
index 810e45a62d88b2c2955e87a5f514870421a438dc..d7c43c1034cf81ac11c93db77a25654c2017bcec 100644 (file)
--- a/queue/series
+++ b/queue/series
@@ -16,3 +16,4 @@ fix-deadlock-in-br_stp_disable_bridge.patch
 fix-zap_thread-s-ptrace-related-problems.patch
 fix-deadlock-in-ext2.patch
 sys_mbind-sanity-checking.patch
+it87-fix-oops-on-removal.patch