Merge branch 'fix/hda' into topic/hda

[linux-2.6-omap-h63xx.git] / drivers / i2c / busses / i2c-sis5595.c

diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index dfc2d5eb6a6895f437abcbb7f19ada78f815e618..f320ab27da463ae26b4d2ed078d250fa7c72d2c9 100644 (file)
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -365,7 +365,6 @@ static const struct i2c_algorithm smbus_algorithm = {
 
 static struct i2c_adapter sis5595_adapter = {
        .owner          = THIS_MODULE,
-       .id             = I2C_HW_SMBUS_SIS5595,
        .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
        .algo           = &smbus_algorithm,
 };
@@ -389,8 +388,8 @@ static int __devinit sis5595_probe(struct pci_dev *dev, const struct pci_device_
        /* set up the sysfs linkage to our parent device */
        sis5595_adapter.dev.parent = &dev->dev;
 
-       sprintf(sis5595_adapter.name, "SMBus SIS5595 adapter at %04x",
-               sis5595_base + SMB_INDEX);
+       snprintf(sis5595_adapter.name, sizeof(sis5595_adapter.name),
+                "SMBus SIS5595 adapter at %04x", sis5595_base + SMB_INDEX);
        err = i2c_add_adapter(&sis5595_adapter);
        if (err) {
                release_region(sis5595_base + SMB_INDEX, 2);