diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-18 16:56:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-18 16:56:54 -0400 |
| commit | 3e5b787ac38575c88ceb20619bcda09cb4c17d8b (patch) | |
| tree | e1617b8c3fa243d919912bebeca7a89840532d34 /drivers/i2c/chips/max6875.c | |
| parent | 026bf9bbcf88f31ea619eb46cf9d62beade00821 (diff) | |
| parent | 70455e790391dac85d9b483a9e286a40df1ecc7f (diff) | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c/max6875: Really prevent 24RF08 corruption
i2c-amd756: Fix functionality flags
i2c: Kill the old driver matching scheme
i2c: Convert remaining new-style drivers to use module aliasing
i2c: Switch pasemi to the new device/driver matching scheme
i2c: Clean up Blackfin BF527 I2C device declarations
i2c-nforce2: Disable the second SMBus channel on the DFI Lanparty NF4 Expert
i2c: New co-maintainer
Diffstat (limited to 'drivers/i2c/chips/max6875.c')
| -rw-r--r-- | drivers/i2c/chips/max6875.c | 3 |
1 files changed, 0 insertions, 3 deletions
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) | |||
| 207 | fake_client->flags = 0; | 207 | fake_client->flags = 0; |
| 208 | strlcpy(fake_client->name, "max6875 subclient", I2C_NAME_SIZE); | 208 | strlcpy(fake_client->name, "max6875 subclient", I2C_NAME_SIZE); |
| 209 | 209 | ||
| 210 | /* Prevent 24RF08 corruption (in case of user error) */ | ||
| 211 | i2c_smbus_write_quick(real_client, 0); | ||
| 212 | |||
| 213 | if ((err = i2c_attach_client(real_client)) != 0) | 210 | if ((err = i2c_attach_client(real_client)) != 0) |
| 214 | goto exit_kfree2; | 211 | goto exit_kfree2; |
| 215 | 212 | ||