Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[karo-tx-linux.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 8ba2bcf727d31a3ed725a2a9a0baf5a506046da8..07f01ac853ff6343c6e3ca51e8066770aa189b09 100644 (file)
--- a/drivers/i2c/busses/i2c-amd756-s4882.c
+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
@@ -169,11 +169,7 @@ static int __init amd756_s4882_init(void)
        }
 
        /* Unregister physical bus */
-       error = i2c_del_adapter(&amd756_smbus);
-       if (error) {
-               dev_err(&amd756_smbus.dev, "Physical bus removal failed\n");
-               goto ERROR0;
-       }
+       i2c_del_adapter(&amd756_smbus);
 
        printk(KERN_INFO "Enabling SMBus multiplexing for Tyan S4882\n");
        /* Define the 5 virtual adapters and algorithms structures */
@@ -197,8 +193,8 @@ static int __init amd756_s4882_init(void)
        for (i = 1; i < 5; i++) {
                s4882_algo[i] = *(amd756_smbus.algo);
                s4882_adapter[i] = amd756_smbus;
-               sprintf(s4882_adapter[i].name,
-                       "SMBus 8111 adapter (CPU%d)", i-1);
+               snprintf(s4882_adapter[i].name, sizeof(s4882_adapter[i].name),
+                        "SMBus 8111 adapter (CPU%d)", i-1);
                s4882_adapter[i].algo = s4882_algo+i;
                s4882_adapter[i].dev.parent = amd756_smbus.dev.parent;
        }