Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[sfrench/cifs-2.6.git] / drivers / i2c / busses / i2c-amd756-s4882.c

diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
index c38a0a112208286787d94966f57048980ad459b8..72872d1e63efb6c864e49c6bec333081e5e3c3b6 100644 (file)
--- a/drivers/i2c/busses/i2c-amd756-s4882.c
+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
@@ -58,7 +58,7 @@ static s32 amd756_access_virt0(struct i2c_adapter * adap, u16 addr,
        /* We exclude the multiplexed addresses */
        if (addr == 0x4c || (addr & 0xfc) == 0x50 || (addr & 0xfc) == 0x30
         || addr == 0x18)
-               return -1;
+               return -ENXIO;
 
        mutex_lock(&amd756_lock);
 
@@ -86,7 +86,7 @@ static inline s32 amd756_access_channel(struct i2c_adapter * adap, u16 addr,
 
        /* We exclude the non-multiplexed addresses */
        if (addr != 0x4c && (addr & 0xfc) != 0x50 && (addr & 0xfc) != 0x30)
-               return -1;
+               return -ENXIO;
 
        mutex_lock(&amd756_lock);
 
@@ -155,6 +155,16 @@ static int __init amd756_s4882_init(void)
        int i, error;
        union i2c_smbus_data ioconfig;
 
+       /* Configure the PCA9556 multiplexer */
+       ioconfig.byte = 0x00; /* All I/O to output mode */
+       error = i2c_smbus_xfer(&amd756_smbus, 0x18, 0, I2C_SMBUS_WRITE, 0x03,
+                              I2C_SMBUS_BYTE_DATA, &ioconfig);
+       if (error) {
+               dev_err(&amd756_smbus.dev, "PCA9556 configuration failed\n");
+               error = -EIO;
+               goto ERROR0;
+       }
+
        /* Unregister physical bus */
        error = i2c_del_adapter(&amd756_smbus);
        if (error) {
@@ -198,22 +208,11 @@ static int __init amd756_s4882_init(void)
        s4882_algo[3].smbus_xfer = amd756_access_virt3;
        s4882_algo[4].smbus_xfer = amd756_access_virt4;
 
-       /* Configure the PCA9556 multiplexer */
-       ioconfig.byte = 0x00; /* All I/O to output mode */
-       error = amd756_smbus.algo->smbus_xfer(&amd756_smbus, 0x18, 0,
-                                             I2C_SMBUS_WRITE, 0x03,
-                                             I2C_SMBUS_BYTE_DATA, &ioconfig);
-       if (error) {
-               dev_err(&amd756_smbus.dev, "PCA9556 configuration failed\n");
-               error = -EIO;
-               goto ERROR3;
-       }
-
        /* Register virtual adapters */
        for (i = 0; i < 5; i++) {
                error = i2c_add_adapter(s4882_adapter+i);
                if (error) {
-                       dev_err(&amd756_smbus.dev,
+                       printk(KERN_ERR "i2c-amd756-s4882: "
                               "Virtual adapter %d registration "
                               "failed, module not inserted\n", i);
                        for (i--; i >= 0; i--)
@@ -252,8 +251,8 @@ static void __exit amd756_s4882_exit(void)
 
        /* Restore physical bus */
        if (i2c_add_adapter(&amd756_smbus))
-               dev_err(&amd756_smbus.dev, "Physical bus restoration "
-                       "failed\n");
+               printk(KERN_ERR "i2c-amd756-s4882: "
+                      "Physical bus restoration failed\n");
 }
 
 MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>");