diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-18 17:52:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-18 17:52:27 -0700 |
| commit | 64d9a39ec9ad074384b548c0cead89265c82e166 (patch) | |
| tree | 5c0cdd72f41584d33e76e4a3c08eeb1960a0b5c7 /drivers/hwmon/lm78.c | |
| parent | 17e6c600b2bc4f15dd5f9144ccb8b5c5211dd6e4 (diff) | |
| parent | bd452e6f178a559408c54c2b4ca29191b812d47f (diff) | |
| download | kernel-crypto-64d9a39ec9ad074384b548c0cead89265c82e166.tar.gz kernel-crypto-64d9a39ec9ad074384b548c0cead89265c82e166.tar.xz kernel-crypto-64d9a39ec9ad074384b548c0cead89265c82e166.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/hwmon-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/hwmon-2.6:
hwmon: Fix debug messages in w83781d
hwmon: Let w83781d and lm78 load again
w83627ehf: Fix the detection of fan5
k8temp: Documentation update
smsc47m1: List the SMSC LPC47M112 as supported
hwmon: Fix documentation typos
adm9240: Update Grant Coady's email address
w83791d: Fix unchecked return status
Diffstat (limited to 'drivers/hwmon/lm78.c')
| -rw-r--r-- | drivers/hwmon/lm78.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c index ac1b746df6d..73bc2ffc598 100644 --- a/drivers/hwmon/lm78.c +++ b/drivers/hwmon/lm78.c @@ -815,18 +815,18 @@ static int __init sm_lm78_init(void) if (res) return res; - res = i2c_isa_add_driver(&lm78_isa_driver); - if (res) { - i2c_del_driver(&lm78_driver); - return res; - } + /* Don't exit if this one fails, we still want the I2C variants + to work! */ + if (i2c_isa_add_driver(&lm78_isa_driver)) + isa_address = 0; return 0; } static void __exit sm_lm78_exit(void) { - i2c_isa_del_driver(&lm78_isa_driver); + if (isa_address) + i2c_isa_del_driver(&lm78_isa_driver); i2c_del_driver(&lm78_driver); } |