diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 19:11:44 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 19:11:44 -0400 |
| commit | 08cd84c81f27d5bd22ba958b7cae6d566c509280 (patch) | |
| tree | 6fdb546c151410851fd3c604d42590afa4215084 /drivers/i2c/chips/max6875.c | |
| parent | e9dd2561793c05d70c9df1bc16a2dde6f23388df (diff) | |
| parent | 327309e899662b482c58cf25f574513d38b5788c (diff) | |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'drivers/i2c/chips/max6875.c')
| -rw-r--r-- | drivers/i2c/chips/max6875.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c index fe6b150ec4c..c4f14d9623c 100644 --- a/drivers/i2c/chips/max6875.c +++ b/drivers/i2c/chips/max6875.c @@ -37,7 +37,8 @@ #include <linux/i2c-sensor.h> /* Addresses to scan */ -static unsigned short normal_i2c[] = {0x50, 0x52, I2C_CLIENT_END}; +/* No address scanned by default, as this could corrupt standard EEPROMS. */ +static unsigned short normal_i2c[] = {I2C_CLIENT_END}; static unsigned int normal_isa[] = {I2C_CLIENT_ISA_END}; /* Insmod parameters */ @@ -369,6 +370,9 @@ 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; |