3 files changed, 13 insertions, 13 deletions

diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index ac1b746df6d0..73bc2ffc598d 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);
 }
 
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index a4584ec69842..fea92061f863 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -1685,11 +1685,10 @@ sensors_w83781d_init(void)
         if (res)
                 return res;
 
-        res = i2c_isa_add_driver(&w83781d_isa_driver);
-        if (res) {
-                i2c_del_driver(&w83781d_driver);
-                return res;
-        }
+        /* Don't exit if this one fails, we still want the I2C variants
+           to work! */
+        if (i2c_isa_add_driver(&w83781d_isa_driver))
+                isa_address = 0;
 
         return 0;
 }
@@ -1697,7 +1696,8 @@ sensors_w83781d_init(void)
 static void __exit
 sensors_w83781d_exit(void)
 {
-        i2c_isa_del_driver(&w83781d_isa_driver);
+        if (isa_address)
+                i2c_isa_del_driver(&w83781d_isa_driver);
         i2c_del_driver(&w83781d_driver);
 }
 
diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c
index 4380653748a4..8ed59a2dff53 100644
--- a/drivers/i2c/busses/i2c-isa.c
+++ b/drivers/i2c/busses/i2c-isa.c
@@ -91,7 +91,7 @@ int i2c_isa_add_driver(struct i2c_driver *driver)
         /* Now look for clients */
         res = driver->attach_adapter(&isa_adapter);
         if (res) {
-                dev_err(&isa_adapter.dev,
+                dev_dbg(&isa_adapter.dev,
                         "Driver %s failed to attach adapter, unregistering\n",
                         driver->driver.name);
                 driver_unregister(&driver->driver);