Changeset 5217

Timestamp:

05/01/08 12:53:50 (5 years ago)

Author:

khali

Message:

Fix an error path. If initialization fails, we want to restore the physical
bus, not delete it again. Backported from Linux 2.6.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• kernel/busses/i2c-amd756-s4882.c (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -4 +4 @@
 SVN-HEAD
   Library: Don't choke on unrecognized devices, part 2
+  Module i2c-amd756-s4882: Fix an error path (2.6 backport)
   Module i2c-i801: Drop broken I2C block read support
   Module i2c-piix4: Minor cleanups (2.6 backport)

lm-sensors/trunk/kernel/busses/i2c-amd756-s4882.c

@@ -231 +231 @@
         s4882_adapter = NULL;
 ERROR1:
-        i2c_del_adapter(&amd756_smbus);
+        /* Restore physical bus */
+        i2c_add_adapter(&amd756_smbus);
 ERROR0:
         return error;