i2c: Fix oops on bus multiplexer driver loading

The two I2C bus multiplexer drivers (i2c-amd756-s4882 and
i2c-nforce2-s4985) make use of the bus they want to multiplex before
checking if it is really present. Swap the instructions to test for
presence first. This fixes a oops reported by Ingo Molnar.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Ingo Molnar <mingo@elte.hu>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
index d1a4cbcf2aa4..29015eb9ca46 100644
--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
@@ -150,6 +150,9 @@ static int __init nforce2_s4985_init(void)
         int i, error;
         union i2c_smbus_data ioconfig;
 
+        if (!nforce2_smbus)
+                return -ENODEV;
+
         /* Configure the PCA9556 multiplexer */
         ioconfig.byte = 0x00; /* All I/O to output mode */
         error = i2c_smbus_xfer(nforce2_smbus, 0x18, 0, I2C_SMBUS_WRITE, 0x03,
@@ -161,8 +164,6 @@ static int __init nforce2_s4985_init(void)
         }
 
         /* Unregister physical bus */
-        if (!nforce2_smbus)
-                return -ENODEV;
         error = i2c_del_adapter(nforce2_smbus);
         if (error) {
                 dev_err(&nforce2_smbus->dev, "Physical bus removal failed\n");