diff --git a/kernel/busses/i2c-ali1535.c b/kernel/busses/i2c-ali1535.c
index 09d41d4c..602cc553 100644
--- a/kernel/busses/i2c-ali1535.c
+++ b/kernel/busses/i2c-ali1535.c
@@ -562,7 +562,7 @@ static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_
 
 	sprintf(ali1535_adapter.name, "SMBus ALI1535 adapter at %04x",
 		ali1535_smba);
-	i2c_add_adapter(&ali1535_adapter);
+	return i2c_add_adapter(&ali1535_adapter);
 }
 
 static void __devexit ali1535_remove(struct pci_dev *dev)
diff --git a/kernel/busses/i2c-i810.c b/kernel/busses/i2c-i810.c
index f0aff21b..9d57b280 100644
--- a/kernel/busses/i2c-i810.c
+++ b/kernel/busses/i2c-i810.c
@@ -252,11 +252,18 @@ static struct pci_device_id i810_ids[] __devinitdata = {
 
 static int __devinit i810_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
+	int retval;
+
 	config_i810(dev);
 	printk("i2c-i810.o: i810/i815 found.\n");
 
-	i2c_bit_add_bus(&i810_i2c_adapter);
-	i2c_bit_add_bus(&i810_ddc_adapter);
+	retval = i2c_bit_add_bus(&i810_i2c_adapter);
+	if(retval)
+		return retval;
+	retval = i2c_bit_add_bus(&i810_ddc_adapter);
+	if(retval)
+		i2c_bit_del_bus(&i810_i2c_adapter);
+	return retval;
 }
 
 static void __devexit i810_remove(struct pci_dev *dev)
diff --git a/kernel/busses/i2c-sis630.c b/kernel/busses/i2c-sis630.c
index 42e94c2f..fa3c4523 100644
--- a/kernel/busses/i2c-sis630.c
+++ b/kernel/busses/i2c-sis630.c
@@ -105,10 +105,12 @@ struct sd {
 
 /* If force is set to anything different from 0, we forcibly enable the
    SIS630. DANGEROUS! */
-static int force = 0;
 static int high_clock = 0;
+/*
+static int force = 0;
 MODULE_PARM(force, "i");
 MODULE_PARM_DESC(force, "Forcibly enable the SIS630. DANGEROUS!");
+*/
 MODULE_PARM(high_clock, "i");
 MODULE_PARM_DESC(high_clock, "Set Host Master Clock to 56KHz (default 14KHz).");
 
@@ -402,7 +404,7 @@ static int __devinit sis630_probe(struct pci_dev *dev, const struct pci_device_i
 
 	sprintf(sis630_adapter.name, "SMBus SIS630 adapter at %04x",
 		acpi_base + SMB_STS);
-	i2c_add_adapter(&sis630_adapter);
+	return i2c_add_adapter(&sis630_adapter);
 }
 
 static void __devexit sis630_remove(struct pci_dev *dev)