[PATCH] I2C: 24RF08 corruption prevention (again)

The 24RF08 corruption prevention in the eeprom and max6875 drivers wasn't
complete. For one thing, the additional quick write should happen as soon
as possible and unconditionally, while both drivers had error paths before.
For another, when a given chip is forced, the core does not emit a quick
write, so a second quick write would cause the corruption rather than
prevent it.

I plan to move the corruption prevention in the core in the long run, so
that individual drivers don't have to care anymore. But I need to merge
i2c_probe and i2c_detect before I do (work in progress).

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
index 6ea413f6d5e562b18bea2016f6feab93da4cf261..a2da31b0dd7bda7260f77a93478b4d5d688af40c 100644 (file)
--- a/drivers/i2c/chips/eeprom.c
+++ b/drivers/i2c/chips/eeprom.c
@@ -163,6 +163,11 @@ int eeprom_detect(struct i2c_adapter *adapter, int address, int kind)
        struct eeprom_data *data;
        int err = 0;
 
+       /* prevent 24RF08 corruption */
+       if (kind < 0)
+               i2c_smbus_xfer(adapter, address, 0, 0, 0,
+                              I2C_SMBUS_QUICK, NULL);
+
        /* There are three ways we can read the EEPROM data:
           (1) I2C block reads (faster, but unsupported by most adapters)
           (2) Consecutive byte reads (100% overhead)
@@ -187,9 +192,6 @@ int eeprom_detect(struct i2c_adapter *adapter, int address, int kind)
        new_client->driver = &eeprom_driver;
        new_client->flags = 0;
 
-       /* prevent 24RF08 corruption */
-       i2c_smbus_write_quick(new_client, 0);
-
        /* Fill in the remaining client fields */
        strlcpy(new_client->name, "eeprom", I2C_NAME_SIZE);
        data->valid = 0;

diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c
index c4f14d9623c428d2023f857aef169b5e0cb3512c..0230375f72e551bb227fda676eecadff0e5def79 100644 (file)
--- a/drivers/i2c/chips/max6875.c
+++ b/drivers/i2c/chips/max6875.c
@@ -343,6 +343,11 @@ static int max6875_detect(struct i2c_adapter *adapter, int address, int kind)
        struct max6875_data *data;
        int err = 0;
 
+       /* Prevent 24RF08 corruption (in case of user error) */
+       if (kind < 0)
+               i2c_smbus_xfer(adapter, address, 0, 0, 0,
+                              I2C_SMBUS_QUICK, NULL);
+
        /* There are three ways we can read the EEPROM data:
           (1) I2C block reads (faster, but unsupported by most adapters)
           (2) Consecutive byte reads (100% overhead)
@@ -370,9 +375,6 @@ static int max6875_detect(struct i2c_adapter *adapter, int address, int kind)
        new_client->driver = &max6875_driver;
        new_client->flags = 0;
 
-       /* Prevent 24RF08 corruption */
-       i2c_smbus_write_quick(new_client, 0);
-
        /* Setup the user section */
        data->blocks[max6875_eeprom_user].type    = max6875_eeprom_user;
        data->blocks[max6875_eeprom_user].slices  = USER_EEPROM_SLICES;