4 files changed, 30 insertions, 25 deletions

diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index 2fa43183d375..43508d61eb7c 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -290,7 +290,7 @@ static u32 amd756_func(struct i2c_adapter *adapter)
 {
         return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
             I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
-            I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_PROC_CALL;
+            I2C_FUNC_SMBUS_BLOCK_DATA;
 }
 
 static const struct i2c_algorithm smbus_algorithm = {
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index 3dac920e53ea..43c9f8df9509 100644
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -50,6 +50,7 @@
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/delay.h>
+#include <linux/dmi.h>
 #include <asm/io.h>
 
 MODULE_LICENSE("GPL");
@@ -109,6 +110,18 @@ struct nforce2_smbus {
 /* Misc definitions */
 #define MAX_TIMEOUT     100
 
+/* We disable the second SMBus channel on these boards */
+static struct dmi_system_id __devinitdata nforce2_dmi_blacklist2[] = {
+        {
+                .ident = "DFI Lanparty NF4 Expert",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "DFI Corp,LTD"),
+                        DMI_MATCH(DMI_BOARD_NAME, "LP UT NF4 Expert"),
+                },
+        },
+        { }
+};
+
 static struct pci_driver nforce2_driver;
 
 static void nforce2_abort(struct i2c_adapter *adap)
@@ -367,10 +380,17 @@ static int __devinit nforce2_probe(struct pci_dev *dev, const struct pci_device_
                 smbuses[0].base = 0;    /* to have a check value */
         }
         /* SMBus adapter 2 */
-        res2 = nforce2_probe_smb(dev, 5, NFORCE_PCI_SMB2, &smbuses[1], "SMB2");
-        if (res2 < 0) {
-                dev_err(&dev->dev, "Error probing SMB2.\n");
-                smbuses[1].base = 0;    /* to have a check value */
+        if (dmi_check_system(nforce2_dmi_blacklist2)) {
+                dev_err(&dev->dev, "Disabling SMB2 for safety reasons.\n");
+                res2 = -EPERM;
+                smbuses[1].base = 0;
+        } else {
+                res2 = nforce2_probe_smb(dev, 5, NFORCE_PCI_SMB2, &smbuses[1],
+                                         "SMB2");
+                if (res2 < 0) {
+                        dev_err(&dev->dev, "Error probing SMB2.\n");
+                        smbuses[1].base = 0;    /* to have a check value */
+                }
         }
         if ((res1 < 0) && (res2 < 0)) {
                 /* we did not find even one of the SMBuses, so we give up */
diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c
index fb7ea5637eca..cf507b3f60f3 100644
--- a/drivers/i2c/chips/max6875.c
+++ b/drivers/i2c/chips/max6875.c
@@ -207,9 +207,6 @@ static int max6875_detect(struct i2c_adapter *adapter, int address, int kind)
         fake_client->flags = 0;
         strlcpy(fake_client->name, "max6875 subclient", I2C_NAME_SIZE);
 
-        /* Prevent 24RF08 corruption (in case of user error) */
-        i2c_smbus_write_quick(real_client, 0);
-
         if ((err = i2c_attach_client(real_client)) != 0)
                 goto exit_kfree2;
 
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index c99ebeadb558..d0175f4f8fc6 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -74,10 +74,7 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv)
         if (driver->id_table)
                 return i2c_match_id(driver->id_table, client) != NULL;
 
-        /* new style drivers use the same kind of driver matching policy
-         * as platform devices or SPI:  compare device and driver IDs.
-         */
-        return strcmp(client->driver_name, drv->name) == 0;
+        return 0;
 }
 
 #ifdef  CONFIG_HOTPLUG
@@ -91,14 +88,9 @@ static int i2c_device_uevent(struct device *dev, struct kobj_uevent_env *env)
         if (dev->driver)
                 return 0;
 
-        if (client->driver_name[0]) {
-                if (add_uevent_var(env, "MODALIAS=%s", client->driver_name))
-                        return -ENOMEM;
-        } else {
-                if (add_uevent_var(env, "MODALIAS=%s%s",
-                                   I2C_MODULE_PREFIX, client->name))
-                        return -ENOMEM;
-        }
+        if (add_uevent_var(env, "MODALIAS=%s%s",
+                           I2C_MODULE_PREFIX, client->name))
+                return -ENOMEM;
         dev_dbg(dev, "uevent\n");
         return 0;
 }
@@ -206,9 +198,7 @@ static ssize_t show_client_name(struct device *dev, struct device_attribute *att
 static ssize_t show_modalias(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct i2c_client *client = to_i2c_client(dev);
-        return client->driver_name[0]
-                ? sprintf(buf, "%s\n", client->driver_name)
-                : sprintf(buf, "%s%s\n", I2C_MODULE_PREFIX, client->name);
+        return sprintf(buf, "%s%s\n", I2C_MODULE_PREFIX, client->name);
 }
 
 static struct device_attribute i2c_dev_attrs[] = {
@@ -282,8 +272,6 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
         client->addr = info->addr;
         client->irq = info->irq;
 
-        strlcpy(client->driver_name, info->driver_name,
-                sizeof(client->driver_name));
         strlcpy(client->name, info->type, sizeof(client->name));
 
         /* a new style driver may be bound to this device when we