aboutsummaryrefslogtreecommitdiff
path: root/drivers/hwmon/it87.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-14 08:22:57 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-14 08:22:57 -0800
commitb739db79a434aec89027a109d85de305e6bdeb93 (patch)
treee67bdf2272e9a3deedef7d65dfde03ccafb85074 /drivers/hwmon/it87.c
parent18539966bc1d663eb232877bb3e9e7dca67e89e6 (diff)
parent41d9c98fe76298cebc5907bcebfb2db28017a277 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/hwmon/it87.c')
-rw-r--r--drivers/hwmon/it87.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index e87d52c5994..d7a9401600b 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -1186,7 +1186,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);
}