Greetings, Second try, adjusted user-agent for larger attachments. Most i2c sensor drivers are not protecting access to their local data copy during access by set_some_value writers. This patch series adds locking to drivers needing it, and modifies some files with locking to for consistent placement of the down() call to after the sysfs value is read. Drivers affected: adm1021 adm1025 adm1026 adm1031 asb100 ds1621 fscher fscpos gl518sm gl520sm it87 lm63 lm75 lm77 lm78 lm80 lm83 lm85 lm87 lm90 lm92 max1619 pc87360 pcf8591 sis5595 smsc47m1 via686a w83627hf w83781d Individual files and worksheet available from http://scatter.mine.nu/lmsensors/lock-on-set/ Compile tested. This patch set includes Jean Delvare's patches reviewed and rediffed to -mm3 by Grant, and await Jean's review and co-sign. Signed-off-by: Grant Coady <gcoady at gmail.com> diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/adm1021.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/adm1021.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/adm1021.c 2005-03-26 07:26:41.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/adm1021.c 2005-03-27 13:51:29.000000000 +1000 @@ -165,8 +165,10 @@ struct adm1021_data *data = i2c_get_clientdata(client); \ int temp = simple_strtoul(buf, NULL, 10); \ \ + down(&data->update_lock); \ data->value = TEMP_TO_REG(temp); \ adm1021_write_value(client, reg, data->value); \ + up(&data->update_lock); \ return count; \ } set(temp_max, ADM1021_REG_TOS_W); diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/adm1025.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/adm1025.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/adm1025.c 2005-03-23 06:34:25.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/adm1025.c 2005-03-27 12:55:14.000000000 +1000 @@ -206,9 +206,12 @@ struct i2c_client *client = to_i2c_client(dev); \ struct adm1025_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->in_min[offset] = IN_TO_REG(val, in_scale[offset]); \ i2c_smbus_write_byte_data(client, ADM1025_REG_IN_MIN(offset), \ data->in_min[offset]); \ + up(&data->update_lock); \ return count; \ } \ static ssize_t set_in##offset##_max(struct device *dev, const char *buf, \ @@ -217,9 +220,12 @@ struct i2c_client *client = to_i2c_client(dev); \ struct adm1025_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->in_max[offset] = IN_TO_REG(val, in_scale[offset]); \ i2c_smbus_write_byte_data(client, ADM1025_REG_IN_MAX(offset), \ data->in_max[offset]); \ + up(&data->update_lock); \ return count; \ } \ static DEVICE_ATTR(in##offset##_min, S_IWUSR | S_IRUGO, \ @@ -240,9 +246,12 @@ struct i2c_client *client = to_i2c_client(dev); \ struct adm1025_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->temp_min[offset-1] = TEMP_TO_REG(val); \ i2c_smbus_write_byte_data(client, ADM1025_REG_TEMP_LOW(offset-1), \ data->temp_min[offset-1]); \ + up(&data->update_lock); \ return count; \ } \ static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \ @@ -251,9 +260,12 @@ struct i2c_client *client = to_i2c_client(dev); \ struct adm1025_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->temp_max[offset-1] = TEMP_TO_REG(val); \ i2c_smbus_write_byte_data(client, ADM1025_REG_TEMP_HIGH(offset-1), \ data->temp_max[offset-1]); \ + up(&data->update_lock); \ return count; \ } \ static DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \ diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/adm1026.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/adm1026.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/adm1026.c 2005-03-23 06:34:25.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/adm1026.c 2005-03-27 12:55:14.000000000 +1000 @@ -726,10 +726,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->in_min[nr] = INS_TO_REG(nr, val); adm1026_write_value(client, ADM1026_REG_IN_MIN[nr], data->in_min[nr]); up(&data->update_lock); @@ -745,10 +744,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->in_max[nr] = INS_TO_REG(nr, val); adm1026_write_value(client, ADM1026_REG_IN_MAX[nr], data->in_max[nr]); up(&data->update_lock); @@ -818,10 +816,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->in_min[16] = INS_TO_REG(16, val + NEG12_OFFSET); adm1026_write_value(client, ADM1026_REG_IN_MIN[16], data->in_min[16]); up(&data->update_lock); @@ -837,10 +834,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->in_max[16] = INS_TO_REG(16, val+NEG12_OFFSET); adm1026_write_value(client, ADM1026_REG_IN_MAX[16], data->in_max[16]); up(&data->update_lock); @@ -873,10 +869,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->fan_min[nr] = FAN_TO_REG(val, data->fan_div[nr]); adm1026_write_value(client, ADM1026_REG_FAN_MIN(nr), data->fan_min[nr]); @@ -1009,10 +1004,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->temp_min[nr] = TEMP_TO_REG(val); adm1026_write_value(client, ADM1026_REG_TEMP_MIN[nr], data->temp_min[nr]); @@ -1029,10 +1023,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->temp_max[nr] = TEMP_TO_REG(val); adm1026_write_value(client, ADM1026_REG_TEMP_MAX[nr], data->temp_max[nr]); @@ -1083,10 +1076,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->temp_offset[nr] = TEMP_TO_REG(val); adm1026_write_value(client, ADM1026_REG_TEMP_OFFSET[nr], data->temp_offset[nr]); @@ -1136,10 +1128,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->temp_tmin[nr] = TEMP_TO_REG(val); adm1026_write_value(client, ADM1026_REG_TEMP_TMIN[nr], data->temp_tmin[nr]); @@ -1190,9 +1181,8 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); - val = simple_strtol(buf, NULL, 10); if ((val == 1) || (val==0)) { down(&data->update_lock); data->config1 = (data->config1 & ~CFG1_THERM_HOT) | (val << 4); @@ -1223,10 +1213,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->temp_crit[nr] = TEMP_TO_REG(val); adm1026_write_value(client, ADM1026_REG_TEMP_THERM[nr], data->temp_crit[nr]); @@ -1261,10 +1250,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->analog_out = DAC_TO_REG(val); adm1026_write_value(client, ADM1026_REG_DAC, data->analog_out); up(&data->update_lock); @@ -1317,11 +1305,10 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); unsigned long mask; down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->alarm_mask = val & 0x7fffffff; mask = data->alarm_mask | (data->gpio_mask & 0x10000 ? 0x80000000 : 0); @@ -1354,11 +1341,10 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); long gpio; down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->gpio = val & 0x1ffff; gpio = data->gpio; adm1026_write_value(client, ADM1026_REG_GPIO_STATUS_0_7,gpio & 0xff); @@ -1383,11 +1369,10 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); long mask; down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->gpio_mask = val & 0x1ffff; mask = data->gpio_mask; adm1026_write_value(client, ADM1026_REG_GPIO_MASK_0_7,mask & 0xff); @@ -1411,11 +1396,10 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); if (data->pwm1.enable == 1) { down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->pwm1.pwm = PWM_TO_REG(val); adm1026_write_value(client, ADM1026_REG_PWM, data->pwm1.pwm); up(&data->update_lock); @@ -1432,10 +1416,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->pwm1.auto_pwm_min = SENSORS_LIMIT(val,0,255); if (data->pwm1.enable == 2) { /* apply immediately */ data->pwm1.pwm = PWM_TO_REG((data->pwm1.pwm & 0x0f) | @@ -1459,10 +1442,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1026_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); int old_enable; - val = simple_strtol(buf, NULL, 10); if ((val >= 0) && (val < 3)) { down(&data->update_lock); old_enable = data->pwm1.enable; diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/adm1031.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/adm1031.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/adm1031.c 2005-03-23 06:34:25.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/adm1031.c 2005-03-27 12:55:14.000000000 +1000 @@ -254,7 +254,7 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1031_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); u8 reg; int ret; u8 old_fan_mode; @@ -262,7 +262,6 @@ old_fan_mode = data->conf1; down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); if ((ret = get_fan_auto_nearest(data, nr, val, data->conf1, ®))) { up(&data->update_lock); @@ -327,10 +326,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1031_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->auto_temp[nr] = AUTO_TEMP_MIN_TO_REG(val, data->auto_temp[nr]); adm1031_write_value(client, ADM1031_REG_AUTO_TEMP(nr), data->auto_temp[nr]); @@ -348,10 +346,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1031_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->temp_max[nr] = AUTO_TEMP_MAX_TO_REG(val, data->auto_temp[nr], data->pwm[nr]); adm1031_write_value(client, ADM1031_REG_AUTO_TEMP(nr), data->temp_max[nr]); @@ -404,10 +401,10 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1031_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); int reg; + down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); if ((data->conf1 & ADM1031_CONF1_AUTO_MODE) && (((val>>4) & 0xf) != 5)) { /* In automatic mode, the only PWM accepted is 33% */ @@ -511,10 +508,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1031_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); if (val) { data->fan_min[nr] = FAN_TO_REG(val, FAN_DIV_FROM_REG(data->fan_div[nr])); @@ -530,12 +526,11 @@ { struct i2c_client *client = to_i2c_client(dev); struct adm1031_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); u8 tmp; int old_div = FAN_DIV_FROM_REG(data->fan_div[nr]); int new_min; - val = simple_strtol(buf, NULL, 10); tmp = val == 8 ? 0xc0 : val == 4 ? 0x80 : val == 2 ? 0x40 : diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/asb100.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/asb100.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/asb100.c 2005-03-23 06:34:25.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/asb100.c 2005-03-27 12:55:14.000000000 +1000 @@ -246,9 +246,12 @@ struct i2c_client *client = to_i2c_client(dev); \ struct asb100_data *data = i2c_get_clientdata(client); \ unsigned long val = simple_strtoul(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->in_##reg[nr] = IN_TO_REG(val); \ asb100_write_value(client, ASB100_REG_IN_##REG(nr), \ data->in_##reg[nr]); \ + up(&data->update_lock); \ return count; \ } @@ -329,8 +332,12 @@ struct i2c_client *client = to_i2c_client(dev); struct asb100_data *data = i2c_get_clientdata(client); u32 val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr])); asb100_write_value(client, ASB100_REG_FAN_MIN(nr), data->fan_min[nr]); + up(&data->update_lock); + return count; } @@ -343,11 +350,14 @@ { struct i2c_client *client = to_i2c_client(dev); struct asb100_data *data = i2c_get_clientdata(client); - unsigned long min = FAN_FROM_REG(data->fan_min[nr], - DIV_FROM_REG(data->fan_div[nr])); + unsigned long min; unsigned long val = simple_strtoul(buf, NULL, 10); int reg; - + + down(&data->update_lock); + + min = FAN_FROM_REG(data->fan_min[nr], + DIV_FROM_REG(data->fan_div[nr])); data->fan_div[nr] = DIV_TO_REG(val); switch(nr) { @@ -373,6 +383,9 @@ data->fan_min[nr] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr])); asb100_write_value(client, ASB100_REG_FAN_MIN(nr), data->fan_min[nr]); + + up(&data->update_lock); + return count; } @@ -450,6 +463,8 @@ struct i2c_client *client = to_i2c_client(dev); \ struct asb100_data *data = i2c_get_clientdata(client); \ unsigned long val = simple_strtoul(buf, NULL, 10); \ + \ + down(&data->update_lock); \ switch (nr) { \ case 1: case 2: \ data->reg[nr] = LM75_TEMP_TO_REG(val); \ @@ -460,6 +475,7 @@ } \ asb100_write_value(client, ASB100_REG_TEMP_##REG(nr+1), \ data->reg[nr]); \ + up(&data->update_lock); \ return count; \ } @@ -560,9 +576,12 @@ struct i2c_client *client = to_i2c_client(dev); struct asb100_data *data = i2c_get_clientdata(client); unsigned long val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); data->pwm &= 0x80; /* keep the enable bit */ data->pwm |= (0x0f & ASB100_PWM_TO_REG(val)); asb100_write_value(client, ASB100_REG_PWM1, data->pwm); + up(&data->update_lock); return count; } @@ -578,9 +597,12 @@ struct i2c_client *client = to_i2c_client(dev); struct asb100_data *data = i2c_get_clientdata(client); unsigned long val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); data->pwm &= 0x0f; /* keep the duty cycle bits */ data->pwm |= (val ? 0x80 : 0x00); asb100_write_value(client, ASB100_REG_PWM1, data->pwm); + up(&data->update_lock); return count; } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/ds1621.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/ds1621.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/ds1621.c 2005-03-23 06:34:25.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/ds1621.c 2005-03-27 12:55:14.000000000 +1000 @@ -153,8 +153,11 @@ { \ struct i2c_client *client = to_i2c_client(dev); \ struct ds1621_data *data = ds1621_update_client(dev); \ + \ + down(&data->update_lock); \ data->value = LM75_TEMP_TO_REG(simple_strtoul(buf, NULL, 10)); \ ds1621_write_value(client, reg, data->value); \ + up(&data->update_lock); \ return count; \ } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/fscher.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/fscher.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/fscher.c 2005-03-23 06:34:25.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/fscher.c 2005-03-27 12:55:14.000000000 +1000 @@ -464,9 +464,12 @@ { /* bits 0..1, 3..7 reserved => mask with 0x04 */ unsigned long v = simple_strtoul(buf, NULL, 10) & 0x04; + + down(&data->update_lock); data->fan_status[FAN_INDEX_FROM_NUM(nr)] &= ~v; fscher_write_value(client, reg, v); + up(&data->update_lock); return count; } @@ -480,9 +483,11 @@ const char *buf, size_t count, int nr, int reg) { unsigned long v = simple_strtoul(buf, NULL, 10); - data->fan_min[FAN_INDEX_FROM_NUM(nr)] = v > 0xff ? 0xff : v; + down(&data->update_lock); + data->fan_min[FAN_INDEX_FROM_NUM(nr)] = v > 0xff ? 0xff : v; fscher_write_value(client, reg, data->fan_min[FAN_INDEX_FROM_NUM(nr)]); + up(&data->update_lock); return count; } @@ -507,11 +512,14 @@ return -EINVAL; } + down(&data->update_lock); + /* bits 2..7 reserved => mask with 0x03 */ data->fan_ripple[FAN_INDEX_FROM_NUM(nr)] &= ~0x03; data->fan_ripple[FAN_INDEX_FROM_NUM(nr)] |= v; fscher_write_value(client, reg, data->fan_ripple[FAN_INDEX_FROM_NUM(nr)]); + up(&data->update_lock); return count; } @@ -537,9 +545,11 @@ { /* bits 2..7 reserved, 0 read only => mask with 0x02 */ unsigned long v = simple_strtoul(buf, NULL, 10) & 0x02; - data->temp_status[TEMP_INDEX_FROM_NUM(nr)] &= ~v; + down(&data->update_lock); + data->temp_status[TEMP_INDEX_FROM_NUM(nr)] &= ~v; fscher_write_value(client, reg, v); + up(&data->update_lock); return count; } @@ -592,9 +602,12 @@ { /* bits 1..7 reserved => mask with 0x01 */ unsigned long v = simple_strtoul(buf, NULL, 10) & 0x01; + + down(&data->update_lock); data->global_control &= ~v; fscher_write_value(client, reg, v); + up(&data->update_lock); return count; } @@ -612,10 +625,13 @@ { /* bits 0..3 reserved => mask with 0xf0 */ unsigned long v = simple_strtoul(buf, NULL, 10) & 0xf0; + + down(&data->update_lock); data->watchdog[2] &= ~0xf0; data->watchdog[2] |= v; fscher_write_value(client, reg, data->watchdog[2]); + up(&data->update_lock); return count; } @@ -630,9 +646,11 @@ { /* bits 0, 2..7 reserved => mask with 0x02 */ unsigned long v = simple_strtoul(buf, NULL, 10) & 0x02; - data->watchdog[1] &= ~v; + down(&data->update_lock); + data->watchdog[1] &= ~v; fscher_write_value(client, reg, v); + up(&data->update_lock); return count; } @@ -645,9 +663,12 @@ static ssize_t set_watchdog_preset(struct i2c_client *client, struct fscher_data *data, const char *buf, size_t count, int nr, int reg) { - data->watchdog[0] = simple_strtoul(buf, NULL, 10) & 0xff; - + unsigned long v = simple_strtoul(buf, NULL, 10) & 0xff; + + down(&data->update_lock); + data->watchdog[0] = v; fscher_write_value(client, reg, data->watchdog[0]); + up(&data->update_lock); return count; } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/fscpos.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/fscpos.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/fscpos.c 2005-03-23 06:34:25.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/fscpos.c 2005-03-27 12:55:14.000000000 +1000 @@ -206,11 +206,13 @@ return -EINVAL; } + down(&data->update_lock); /* bits 2..7 reserved => mask with 0x03 */ data->fan_ripple[nr - 1] &= ~0x03; data->fan_ripple[nr - 1] |= v; fscpos_write_value(client, reg, data->fan_ripple[nr - 1]); + up(&data->update_lock); return count; } @@ -228,8 +230,10 @@ if (v < 0) v = 0; if (v > 255) v = 255; + down(&data->update_lock); data->pwm[nr - 1] = v; fscpos_write_value(client, reg, data->pwm[nr - 1]); + up(&data->update_lock); return count; } @@ -271,10 +275,13 @@ { /* bits 0..3 reserved => mask with 0xf0 */ unsigned long v = simple_strtoul(buf, NULL, 10) & 0xf0; + + down(&data->update_lock); data->wdog_control &= ~0xf0; data->wdog_control |= v; fscpos_write_value(client, reg, data->wdog_control); + up(&data->update_lock); return count; } @@ -296,9 +303,11 @@ return -EINVAL; } + down(&data->update_lock); data->wdog_state &= ~v; fscpos_write_value(client, reg, v); + up(&data->update_lock); return count; } @@ -310,9 +319,13 @@ static ssize_t set_wdog_preset(struct i2c_client *client, struct fscpos_data *data, const char *buf, size_t count, int reg) { - data->wdog_preset = simple_strtoul(buf, NULL, 10) & 0xff; + unsigned long v = simple_strtoul(buf, NULL, 10) & 0xff; + + down(&data->update_lock); + data->wdog_preset = v; fscpos_write_value(client, reg, data->wdog_preset); + up(&data->update_lock); return count; } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/gl518sm.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/gl518sm.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/gl518sm.c 2005-03-23 06:34:25.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/gl518sm.c 2005-03-27 12:55:14.000000000 +1000 @@ -211,8 +211,11 @@ struct i2c_client *client = to_i2c_client(dev); \ struct gl518_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->value = type##_TO_REG(val); \ gl518_write_value(client, reg, data->value); \ + up(&data->update_lock); \ return count; \ } @@ -222,11 +225,15 @@ { \ struct i2c_client *client = to_i2c_client(dev); \ struct gl518_data *data = i2c_get_clientdata(client); \ - int regvalue = gl518_read_value(client, reg); \ + int regvalue; \ unsigned long val = simple_strtoul(buf, NULL, 10); \ + \ + down(&data->update_lock); \ + regvalue = gl518_read_value(client, reg); \ data->value = type##_TO_REG(val); \ regvalue = (regvalue & ~mask) | (data->value << shift); \ gl518_write_value(client, reg, regvalue); \ + up(&data->update_lock); \ return count; \ } @@ -255,8 +262,10 @@ { struct i2c_client *client = to_i2c_client(dev); struct gl518_data *data = i2c_get_clientdata(client); - int regvalue = gl518_read_value(client, GL518_REG_FAN_LIMIT); + int regvalue; + down(&data->update_lock); + regvalue = gl518_read_value(client, GL518_REG_FAN_LIMIT); data->fan_min[0] = FAN_TO_REG(simple_strtoul(buf, NULL, 10), DIV_FROM_REG(data->fan_div[0])); regvalue = (regvalue & 0x00ff) | (data->fan_min[0] << 8); @@ -270,6 +279,7 @@ data->beep_mask &= data->alarm_mask; gl518_write_value(client, GL518_REG_ALARM, data->beep_mask); + up(&data->update_lock); return count; } @@ -277,8 +287,10 @@ { struct i2c_client *client = to_i2c_client(dev); struct gl518_data *data = i2c_get_clientdata(client); - int regvalue = gl518_read_value(client, GL518_REG_FAN_LIMIT); + int regvalue; + down(&data->update_lock); + regvalue = gl518_read_value(client, GL518_REG_FAN_LIMIT); data->fan_min[1] = FAN_TO_REG(simple_strtoul(buf, NULL, 10), DIV_FROM_REG(data->fan_div[1])); regvalue = (regvalue & 0xff00) | data->fan_min[1]; @@ -292,6 +304,7 @@ data->beep_mask &= data->alarm_mask; gl518_write_value(client, GL518_REG_ALARM, data->beep_mask); + up(&data->update_lock); return count; } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/gl520sm.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/gl520sm.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/gl520sm.c 2005-03-23 06:34:25.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/gl520sm.c 2005-03-27 12:55:14.000000000 +1000 @@ -301,6 +301,8 @@ long v = simple_strtol(buf, NULL, 10); u8 r; + down(&data->update_lock); + if (n == 0) r = VDD_TO_REG(v); else @@ -313,6 +315,7 @@ else gl520_write_value(client, reg, r); + up(&data->update_lock); return count; } @@ -326,6 +329,8 @@ else r = IN_TO_REG(v); + down(&data->update_lock); + data->in_max[n] = r; if (n < 4) @@ -333,6 +338,7 @@ else gl520_write_value(client, reg, r); + up(&data->update_lock); return count; } @@ -365,6 +371,7 @@ unsigned long v = simple_strtoul(buf, NULL, 10); u8 r = FAN_TO_REG(v, data->fan_div[n - 1]); + down(&data->update_lock); data->fan_min[n - 1] = r; if (n == 1) @@ -380,6 +387,7 @@ data->beep_mask &= data->alarm_mask; gl520_write_value(client, GL520_REG_BEEP_MASK, data->beep_mask); + up(&data->update_lock); return count; } @@ -398,6 +406,7 @@ return -EINVAL; } + down(&data->update_lock); data->fan_div[n - 1] = r; if (n == 1) @@ -405,6 +414,7 @@ else gl520_write_value(client, reg, (gl520_read_value(client, reg) & ~0x30) | (r << 4)); + up(&data->update_lock); return count; } @@ -412,9 +422,11 @@ { u8 r = simple_strtoul(buf, NULL, 10)?1:0; + down(&data->update_lock); data->fan_off = r; gl520_write_value(client, reg, (gl520_read_value(client, reg) & ~0x0c) | (r << 2)); + up(&data->update_lock); return count; } @@ -439,22 +451,28 @@ static ssize_t set_temp_max(struct i2c_client *client, struct gl520_data *data, const char *buf, size_t count, int n, int reg) { long v = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); u8 r = TEMP_TO_REG(v); data->temp_max[n - 1] = r; gl520_write_value(client, reg, r); + up(&data->update_lock); return count; } static ssize_t set_temp_max_hyst(struct i2c_client *client, struct gl520_data *data, const char *buf, size_t count, int n, int reg) { long v = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); u8 r = TEMP_TO_REG(v); data->temp_max_hyst[n - 1] = r; gl520_write_value(client, reg, r); + up(&data->update_lock); return count; } @@ -477,19 +495,23 @@ { u8 r = simple_strtoul(buf, NULL, 10)?0:1; + down(&data->update_lock); data->beep_enable = !r; gl520_write_value(client, reg, (gl520_read_value(client, reg) & ~0x04) | (r << 2)); + up(&data->update_lock); return count; } static ssize_t set_beep_mask(struct i2c_client *client, struct gl520_data *data, const char *buf, size_t count, int n, int reg) { + down(&data->update_lock); u8 r = simple_strtoul(buf, NULL, 10) & data->alarm_mask; data->beep_mask = r; gl520_write_value(client, reg, r); + up(&data->update_lock); return count; } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/it87.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/it87.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/it87.c 2005-03-26 07:26:41.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/it87.c 2005-03-27 12:55:14.000000000 +1000 @@ -265,9 +265,12 @@ struct i2c_client *client = to_i2c_client(dev); struct it87_data *data = i2c_get_clientdata(client); unsigned long val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); data->in_min[nr] = IN_TO_REG(val); it87_write_value(client, IT87_REG_VIN_MIN(nr), data->in_min[nr]); + up(&data->update_lock); return count; } static ssize_t set_in_max(struct device *dev, const char *buf, @@ -276,9 +279,12 @@ struct i2c_client *client = to_i2c_client(dev); struct it87_data *data = i2c_get_clientdata(client); unsigned long val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); data->in_max[nr] = IN_TO_REG(val); it87_write_value(client, IT87_REG_VIN_MAX(nr), data->in_max[nr]); + up(&data->update_lock); return count; } @@ -356,8 +362,11 @@ struct i2c_client *client = to_i2c_client(dev); struct it87_data *data = i2c_get_clientdata(client); int val = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); data->temp_high[nr] = TEMP_TO_REG(val); it87_write_value(client, IT87_REG_TEMP_HIGH(nr), data->temp_high[nr]); + up(&data->update_lock); return count; } static ssize_t set_temp_min(struct device *dev, const char *buf, @@ -366,8 +375,11 @@ struct i2c_client *client = to_i2c_client(dev); struct it87_data *data = i2c_get_clientdata(client); int val = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); data->temp_low[nr] = TEMP_TO_REG(val); it87_write_value(client, IT87_REG_TEMP_LOW(nr), data->temp_low[nr]); + up(&data->update_lock); return count; } #define show_temp_offset(offset) \ @@ -408,9 +420,11 @@ static ssize_t show_sensor(struct device *dev, char *buf, int nr) { struct it87_data *data = it87_update_device(dev); - if (data->sensor & (1 << nr)) + u8 reg = data->sensor; /* In case the value is updated while we use it */ + + if (reg & (1 << nr)) return sprintf(buf, "3\n"); /* thermal diode */ - if (data->sensor & (8 << nr)) + if (reg & (8 << nr)) return sprintf(buf, "2\n"); /* thermistor */ return sprintf(buf, "0\n"); /* disabled */ } @@ -421,6 +435,8 @@ struct it87_data *data = i2c_get_clientdata(client); int val = simple_strtol(buf, NULL, 10); + down(&data->update_lock); + data->sensor &= ~(1 << nr); data->sensor &= ~(8 << nr); /* 3 = thermal diode; 2 = thermistor; 0 = disabled */ @@ -428,9 +444,12 @@ data->sensor |= 1 << nr; else if (val == 2) data->sensor |= 8 << nr; - else if (val != 0) + else if (val != 0) { + up(&data->update_lock); return -EINVAL; + } it87_write_value(client, IT87_REG_TEMP_ENABLE, data->sensor); + up(&data->update_lock); return count; } #define show_sensor_offset(offset) \ @@ -484,8 +503,11 @@ struct i2c_client *client = to_i2c_client(dev); struct it87_data *data = i2c_get_clientdata(client); int val = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr])); it87_write_value(client, IT87_REG_FAN_MIN(nr), data->fan_min[nr]); + up(&data->update_lock); return count; } static ssize_t set_fan_div(struct device *dev, const char *buf, @@ -495,7 +517,10 @@ struct it87_data *data = i2c_get_clientdata(client); int val = simple_strtol(buf, NULL, 10); int i, min[3]; - u8 old = it87_read_value(client, IT87_REG_FAN_DIV); + u8 old; + + down(&data->update_lock); + old = it87_read_value(client, IT87_REG_FAN_DIV); for (i = 0; i < 3; i++) min[i] = FAN_FROM_REG(data->fan_min[i], DIV_FROM_REG(data->fan_div[i])); @@ -522,6 +547,7 @@ data->fan_min[i]=FAN_TO_REG(min[i], DIV_FROM_REG(data->fan_div[i])); it87_write_value(client, IT87_REG_FAN_MIN(i), data->fan_min[i]); } + up(&data->update_lock); return count; } static ssize_t set_pwm_enable(struct device *dev, const char *buf, @@ -531,6 +557,8 @@ struct it87_data *data = i2c_get_clientdata(client); int val = simple_strtol(buf, NULL, 10); + down(&data->update_lock); + if (val == 0) { int tmp; /* make sure the fan is on when in on/off mode */ @@ -545,9 +573,12 @@ it87_write_value(client, IT87_REG_FAN_MAIN_CTRL, data->fan_main_ctrl); /* set saved pwm value, clear FAN_CTLX PWM mode bit */ it87_write_value(client, IT87_REG_PWM(nr), PWM_TO_REG(data->manual_pwm_ctl[nr])); - } else + } else { + up(&data->update_lock); return -EINVAL; + } + up(&data->update_lock); return count; } static ssize_t set_pwm(struct device *dev, const char *buf, @@ -560,10 +591,13 @@ if (val < 0 || val > 255) return -EINVAL; + down(&data->update_lock); + data->manual_pwm_ctl[nr] = val; if (data->fan_main_ctrl & (1 << nr)) it87_write_value(client, IT87_REG_PWM(nr), PWM_TO_REG(data->manual_pwm_ctl[nr])); + up(&data->update_lock); return count; } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm63.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm63.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm63.c 2005-03-23 06:34:25.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm63.c 2005-03-27 12:55:14.000000000 +1000 @@ -191,11 +191,14 @@ struct i2c_client *client = to_i2c_client(dev); struct lm63_data *data = i2c_get_clientdata(client); unsigned long val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); data->fan1_low = FAN_TO_REG(val); i2c_smbus_write_byte_data(client, LM63_REG_TACH_LIMIT_LSB, data->fan1_low & 0xFF); i2c_smbus_write_byte_data(client, LM63_REG_TACH_LIMIT_MSB, data->fan1_low >> 8); + up(&data->update_lock); return count; } @@ -217,10 +220,12 @@ return -EPERM; val = simple_strtoul(buf, NULL, 10); + down(&data->update_lock); data->pwm1_value = val <= 0 ? 0 : val >= 255 ? 2 * data->pwm1_freq : (val * data->pwm1_freq * 2 + 127) / 255; i2c_smbus_write_byte_data(client, LM63_REG_PWM_VALUE, data->pwm1_value); + up(&data->update_lock); return count; } @@ -256,8 +261,11 @@ struct i2c_client *client = to_i2c_client(dev); \ struct lm63_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->value = TEMP8_TO_REG(val); \ i2c_smbus_write_byte_data(client, reg, data->value); \ + up(&data->update_lock); \ return count; \ } #define set_temp11(value, reg_msb, reg_lsb) \ @@ -267,9 +275,12 @@ struct i2c_client *client = to_i2c_client(dev); \ struct lm63_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->value = TEMP11_TO_REG(val); \ i2c_smbus_write_byte_data(client, reg_msb, data->value >> 8); \ i2c_smbus_write_byte_data(client, reg_lsb, data->value & 0xff); \ + up(&data->update_lock); \ return count; \ } set_temp8(temp1_high, LM63_REG_LOCAL_HIGH); @@ -292,10 +303,14 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm63_data *data = i2c_get_clientdata(client); - int hyst = TEMP8_FROM_REG(data->temp2_crit) - - simple_strtol(buf, NULL, 10); + long val = simple_strtol(buf, NULL, 10); + long hyst; + + down(&data->update_lock); + hyst = TEMP8_FROM_REG(data->temp2_crit) - val; i2c_smbus_write_byte_data(client, LM63_REG_REMOTE_TCRIT_HYST, HYST_TO_REG(hyst)); + up(&data->update_lock); return count; } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm75.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm75.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm75.c 2005-03-23 06:34:25.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm75.c 2005-03-27 12:55:14.000000000 +1000 @@ -90,8 +90,11 @@ struct i2c_client *client = to_i2c_client(dev); \ struct lm75_data *data = i2c_get_clientdata(client); \ int temp = simple_strtoul(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->value = LM75_TEMP_TO_REG(temp); \ lm75_write_value(client, reg, data->value); \ + up(&data->update_lock); \ return count; \ } set(temp_max, LM75_REG_TEMP_OS); diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm77.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm77.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm77.c 2005-03-23 06:34:25.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm77.c 2005-03-27 12:55:14.000000000 +1000 @@ -138,8 +138,11 @@ { \ struct i2c_client *client = to_i2c_client(dev); \ struct lm77_data *data = i2c_get_clientdata(client); \ + \ + down(&data->update_lock); \ data->value = simple_strtoul(buf, NULL, 10); \ lm77_write_value(client, reg, LM77_TEMP_TO_REG(data->value)); \ + up(&data->update_lock); \ return count; \ } @@ -152,9 +155,13 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm77_data *data = i2c_get_clientdata(client); - data->temp_hyst = data->temp_crit - simple_strtoul(buf, NULL, 10); + unsigned long val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); + data->temp_hyst = data->temp_crit - val; lm77_write_value(client, LM77_REG_TEMP_HYST, LM77_TEMP_TO_REG(data->temp_hyst)); + up(&data->update_lock); return count; } @@ -163,13 +170,17 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm77_data *data = i2c_get_clientdata(client); - int oldcrithyst = data->temp_crit - data->temp_hyst; + int oldcrithyst; + + down(&data->update_lock); + oldcrithyst = data->temp_crit - data->temp_hyst; data->temp_crit = simple_strtoul(buf, NULL, 10); data->temp_hyst = data->temp_crit - oldcrithyst; lm77_write_value(client, LM77_REG_TEMP_CRIT, LM77_TEMP_TO_REG(data->temp_crit)); lm77_write_value(client, LM77_REG_TEMP_HYST, LM77_TEMP_TO_REG(data->temp_hyst)); + up(&data->update_lock); return count; } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm78.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm78.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm78.c 2005-03-23 06:34:25.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm78.c 2005-03-27 12:55:14.000000000 +1000 @@ -200,8 +200,11 @@ struct i2c_client *client = to_i2c_client(dev); struct lm78_data *data = i2c_get_clientdata(client); unsigned long val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); data->in_min[nr] = IN_TO_REG(val); lm78_write_value(client, LM78_REG_IN_MIN(nr), data->in_min[nr]); + up(&data->update_lock); return count; } @@ -211,8 +214,11 @@ struct i2c_client *client = to_i2c_client(dev); struct lm78_data *data = i2c_get_clientdata(client); unsigned long val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); data->in_max[nr] = IN_TO_REG(val); lm78_write_value(client, LM78_REG_IN_MAX(nr), data->in_max[nr]); + up(&data->update_lock); return count; } @@ -275,8 +281,11 @@ struct i2c_client *client = to_i2c_client(dev); struct lm78_data *data = i2c_get_clientdata(client); long val = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); data->temp_over = TEMP_TO_REG(val); lm78_write_value(client, LM78_REG_TEMP_OVER, data->temp_over); + up(&data->update_lock); return count; } @@ -291,8 +300,11 @@ struct i2c_client *client = to_i2c_client(dev); struct lm78_data *data = i2c_get_clientdata(client); long val = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); data->temp_hyst = TEMP_TO_REG(val); lm78_write_value(client, LM78_REG_TEMP_HYST, data->temp_hyst); + up(&data->update_lock); return count; } @@ -323,8 +335,11 @@ struct i2c_client *client = to_i2c_client(dev); struct lm78_data *data = i2c_get_clientdata(client); unsigned long val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr])); lm78_write_value(client, LM78_REG_FAN_MIN(nr), data->fan_min[nr]); + up(&data->update_lock); return count; } @@ -343,10 +358,14 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm78_data *data = i2c_get_clientdata(client); - unsigned long min = FAN_FROM_REG(data->fan_min[nr], - DIV_FROM_REG(data->fan_div[nr])); unsigned long val = simple_strtoul(buf, NULL, 10); - int reg = lm78_read_value(client, LM78_REG_VID_FANDIV); + unsigned long min; + u8 reg; + + down(&data->update_lock); + min = FAN_FROM_REG(data->fan_min[nr], + DIV_FROM_REG(data->fan_div[nr])); + switch (val) { case 1: data->fan_div[nr] = 0; break; case 2: data->fan_div[nr] = 1; break; @@ -355,9 +374,11 @@ default: dev_err(&client->dev, "fan_div value %ld not " "supported. Choose one of 1, 2, 4 or 8!\n", val); + up(&data->update_lock); return -EINVAL; } + reg = lm78_read_value(client, LM78_REG_VID_FANDIV); switch (nr) { case 0: reg = (reg & 0xcf) | (data->fan_div[nr] << 4); @@ -367,9 +388,12 @@ break; } lm78_write_value(client, LM78_REG_VID_FANDIV, reg); + data->fan_min[nr] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr])); lm78_write_value(client, LM78_REG_FAN_MIN(nr), data->fan_min[nr]); + up(&data->update_lock); + return count; } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm80.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm80.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm80.c 2005-03-23 06:34:25.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm80.c 2005-03-27 12:55:14.000000000 +1000 @@ -190,8 +190,11 @@ struct i2c_client *client = to_i2c_client(dev); \ struct lm80_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock);\ data->value = IN_TO_REG(val); \ lm80_write_value(client, reg, data->value); \ + up(&data->update_lock);\ return count; \ } set_in(min0, in_min[0], LM80_REG_IN_MIN(0)); @@ -237,8 +240,11 @@ struct i2c_client *client = to_i2c_client(dev); \ struct lm80_data *data = i2c_get_clientdata(client); \ long val = simple_strtoul(buf, NULL, 10); \ + \ + down(&data->update_lock);\ data->value = FAN_TO_REG(val, DIV_FROM_REG(data->div)); \ lm80_write_value(client, reg, data->value); \ + up(&data->update_lock);\ return count; \ } set_fan(min1, fan_min[0], LM80_REG_FAN_MIN(1), fan_div[0]); @@ -253,15 +259,14 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm80_data *data = i2c_get_clientdata(client); - unsigned long min, val; + unsigned long min, val = simple_strtoul(buf, NULL, 10); u8 reg; /* Save fan_min */ + down(&data->update_lock); min = FAN_FROM_REG(data->fan_min[nr], DIV_FROM_REG(data->fan_div[nr])); - val = simple_strtoul(buf, NULL, 10); - switch (val) { case 1: data->fan_div[nr] = 0; break; case 2: data->fan_div[nr] = 1; break; @@ -270,6 +275,7 @@ default: dev_err(&client->dev, "fan_div value %ld not " "supported. Choose one of 1, 2, 4 or 8!\n", val); + up(&data->update_lock); return -EINVAL; } @@ -280,6 +286,7 @@ /* Restore fan_min */ data->fan_min[nr] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr])); lm80_write_value(client, LM80_REG_FAN_MIN(nr + 1), data->fan_min[nr]); + up(&data->update_lock); return count; } @@ -317,8 +324,11 @@ struct i2c_client *client = to_i2c_client(dev); \ struct lm80_data *data = i2c_get_clientdata(client); \ long val = simple_strtoul(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->value = TEMP_LIMIT_TO_REG(val); \ lm80_write_value(client, reg, data->value); \ + up(&data->update_lock); \ return count; \ } set_temp(hot_max, temp_hot_max, LM80_REG_TEMP_HOT_MAX); diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm83.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm83.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm83.c 2005-03-23 06:34:25.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm83.c 2005-03-27 12:55:14.000000000 +1000 @@ -177,8 +177,11 @@ struct i2c_client *client = to_i2c_client(dev); \ struct lm83_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->value = TEMP_TO_REG(val); \ i2c_smbus_write_byte_data(client, reg, data->value); \ + up(&data->update_lock); \ return count; \ } set_temp(high1, temp_high[0], LM83_REG_W_LOCAL_HIGH); diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm85.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm85.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm85.c 2005-03-26 07:26:41.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm85.c 2005-03-27 12:55:14.000000000 +1000 @@ -416,10 +416,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm85_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->fan_min[nr] = FAN_TO_REG(val); lm85_write_value(client, LM85_REG_FAN_MIN(nr), data->fan_min[nr]); up(&data->update_lock); @@ -499,10 +498,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm85_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->pwm[nr] = PWM_TO_REG(val); lm85_write_value(client, LM85_REG_PWM(nr), data->pwm[nr]); up(&data->update_lock); @@ -560,10 +558,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm85_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->in_min[nr] = INS_TO_REG(nr, val); lm85_write_value(client, LM85_REG_IN_MIN(nr), data->in_min[nr]); up(&data->update_lock); @@ -579,10 +576,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm85_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->in_max[nr] = INS_TO_REG(nr, val); lm85_write_value(client, LM85_REG_IN_MAX(nr), data->in_max[nr]); up(&data->update_lock); @@ -643,10 +639,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm85_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->temp_min[nr] = TEMP_TO_REG(val); lm85_write_value(client, LM85_REG_TEMP_MIN(nr), data->temp_min[nr]); up(&data->update_lock); @@ -662,10 +657,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm85_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->temp_max[nr] = TEMP_TO_REG(val); lm85_write_value(client, LM85_REG_TEMP_MAX(nr), data->temp_max[nr]); up(&data->update_lock); @@ -718,10 +712,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm85_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->autofan[nr].config = (data->autofan[nr].config & (~0xe0)) | ZONE_TO_REG(val) ; lm85_write_value(client, LM85_REG_AFAN_CONFIG(nr), @@ -739,10 +732,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm85_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->autofan[nr].min_pwm = PWM_TO_REG(val); lm85_write_value(client, LM85_REG_AFAN_MINPWM(nr), data->autofan[nr].min_pwm); @@ -759,10 +751,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm85_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->autofan[nr].min_off = val; lm85_write_value(client, LM85_REG_AFAN_SPIKE1, data->smooth[0] | data->syncpwm3 @@ -783,10 +774,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm85_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->autofan[nr].freq = FREQ_TO_REG(val); lm85_write_value(client, LM85_REG_AFAN_RANGE(nr), (data->zone[nr].range << 4) @@ -865,10 +855,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm85_data *data = i2c_get_clientdata(client); - int min, val; + int min, val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); min = TEMP_FROM_REG(data->zone[nr].limit); data->zone[nr].off_desired = TEMP_TO_REG(val); data->zone[nr].hyst = HYST_TO_REG(min - val); @@ -895,10 +884,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm85_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->zone[nr].limit = TEMP_TO_REG(val); lm85_write_value(client, LM85_REG_AFAN_LIMIT(nr), data->zone[nr].limit); @@ -939,11 +927,10 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm85_data *data = i2c_get_clientdata(client); - int min, val; + int min, val = simple_strtol(buf, NULL, 10); down(&data->update_lock); min = TEMP_FROM_REG(data->zone[nr].limit); - val = simple_strtol(buf, NULL, 10); data->zone[nr].max_desired = TEMP_TO_REG(val); data->zone[nr].range = RANGE_TO_REG( val - min); @@ -963,10 +950,9 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm85_data *data = i2c_get_clientdata(client); - int val; + int val = simple_strtol(buf, NULL, 10); down(&data->update_lock); - val = simple_strtol(buf, NULL, 10); data->zone[nr].critical = TEMP_TO_REG(val); lm85_write_value(client, LM85_REG_AFAN_CRITICAL(nr), data->zone[nr].critical); diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm87.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm87.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm87.c 2005-03-23 06:34:25.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm87.c 2005-03-27 12:55:14.000000000 +1000 @@ -252,9 +252,12 @@ struct i2c_client *client = to_i2c_client(dev); struct lm87_data *data = i2c_get_clientdata(client); long val = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); data->in_min[nr] = IN_TO_REG(val, data->in_scale[nr]); lm87_write_value(client, nr<6 ? LM87_REG_IN_MIN(nr) : LM87_REG_AIN_MIN(nr-6), data->in_min[nr]); + up(&data->update_lock); } static void set_in_max(struct device *dev, const char *buf, int nr) @@ -262,9 +265,12 @@ struct i2c_client *client = to_i2c_client(dev); struct lm87_data *data = i2c_get_clientdata(client); long val = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); data->in_max[nr] = IN_TO_REG(val, data->in_scale[nr]); lm87_write_value(client, nr<6 ? LM87_REG_IN_MAX(nr) : LM87_REG_AIN_MAX(nr-6), data->in_max[nr]); + up(&data->update_lock); } #define set_in(offset) \ @@ -320,8 +326,11 @@ struct i2c_client *client = to_i2c_client(dev); struct lm87_data *data = i2c_get_clientdata(client); long val = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); data->temp_low[nr] = TEMP_TO_REG(val); lm87_write_value(client, LM87_REG_TEMP_LOW[nr], data->temp_low[nr]); + up(&data->update_lock); } static void set_temp_high(struct device *dev, const char *buf, int nr) @@ -329,8 +338,11 @@ struct i2c_client *client = to_i2c_client(dev); struct lm87_data *data = i2c_get_clientdata(client); long val = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); data->temp_high[nr] = TEMP_TO_REG(val); lm87_write_value(client, LM87_REG_TEMP_HIGH[nr], data->temp_high[nr]); + up(&data->update_lock); } #define set_temp(offset) \ @@ -398,9 +410,12 @@ struct i2c_client *client = to_i2c_client(dev); struct lm87_data *data = i2c_get_clientdata(client); long val = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); data->fan_min[nr] = FAN_TO_REG(val, FAN_DIV_FROM_REG(data->fan_div[nr])); lm87_write_value(client, LM87_REG_FAN_MIN(nr), data->fan_min[nr]); + up(&data->update_lock); } /* Note: we save and restore the fan minimum here, because its value is @@ -413,16 +428,21 @@ struct i2c_client *client = to_i2c_client(dev); struct lm87_data *data = i2c_get_clientdata(client); long val = simple_strtol(buf, NULL, 10); - unsigned long min = FAN_FROM_REG(data->fan_min[nr], - FAN_DIV_FROM_REG(data->fan_div[nr])); + unsigned long min; u8 reg; + down(&data->update_lock); + min = FAN_FROM_REG(data->fan_min[nr], + FAN_DIV_FROM_REG(data->fan_div[nr])); + switch (val) { case 1: data->fan_div[nr] = 0; break; case 2: data->fan_div[nr] = 1; break; case 4: data->fan_div[nr] = 2; break; case 8: data->fan_div[nr] = 3; break; - default: return -EINVAL; + default: + up(&data->update_lock); + return -EINVAL; } reg = lm87_read_value(client, LM87_REG_VID_FAN_DIV); @@ -439,6 +459,8 @@ data->fan_min[nr] = FAN_TO_REG(min, val); lm87_write_value(client, LM87_REG_FAN_MIN(nr), data->fan_min[nr]); + up(&data->update_lock); + return count; } @@ -499,8 +521,11 @@ struct i2c_client *client = to_i2c_client(dev); struct lm87_data *data = i2c_get_clientdata(client); long val = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); data->aout = AOUT_TO_REG(val); lm87_write_value(client, LM87_REG_AOUT, data->aout); + up(&data->update_lock); return count; } static DEVICE_ATTR(aout_output, S_IRUGO | S_IWUSR, show_aout, set_aout); diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm90.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm90.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm90.c 2005-03-26 07:26:41.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm90.c 2005-03-27 12:55:14.000000000 +1000 @@ -239,11 +239,14 @@ struct i2c_client *client = to_i2c_client(dev); \ struct lm90_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ if (data->kind == adt7461) \ data->value = TEMP1_TO_REG_ADT7461(val); \ else \ data->value = TEMP1_TO_REG(val); \ i2c_smbus_write_byte_data(client, reg, data->value); \ + up(&data->update_lock); \ return count; \ } #define set_temp2(value, regh, regl) \ @@ -253,12 +256,15 @@ struct i2c_client *client = to_i2c_client(dev); \ struct lm90_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ if (data->kind == adt7461) \ data->value = TEMP2_TO_REG_ADT7461(val); \ else \ data->value = TEMP2_TO_REG(val); \ i2c_smbus_write_byte_data(client, regh, data->value >> 8); \ i2c_smbus_write_byte_data(client, regl, data->value & 0xff); \ + up(&data->update_lock); \ return count; \ } set_temp1(temp_low1, LM90_REG_W_LOCAL_LOW); @@ -283,10 +289,14 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm90_data *data = i2c_get_clientdata(client); - int hyst = TEMP1_FROM_REG(data->temp_crit1) - - simple_strtol(buf, NULL, 10); + long val = simple_strtol(buf, NULL, 10); + long hyst; + + down(&data->update_lock); + hyst = TEMP1_FROM_REG(data->temp_crit1) - val; i2c_smbus_write_byte_data(client, LM90_REG_W_TCRIT_HYST, HYST_TO_REG(hyst)); + up(&data->update_lock); return count; } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm92.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm92.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/lm92.c 2005-03-26 07:26:41.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/lm92.c 2005-03-27 12:55:14.000000000 +1000 @@ -157,8 +157,11 @@ struct i2c_client *client = to_i2c_client(dev); \ struct lm92_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->value = TEMP_TO_REG(val); \ i2c_smbus_write_word_data(client, reg, swab16(data->value)); \ + up(&data->update_lock); \ return count; \ } set_temp(temp1_crit, LM92_REG_TEMP_CRIT); @@ -189,10 +192,13 @@ { struct i2c_client *client = to_i2c_client(dev); struct lm92_data *data = i2c_get_clientdata(client); - data->temp1_hyst = TEMP_FROM_REG(data->temp1_crit) - - simple_strtol(buf, NULL, 10); + long val = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); + data->temp1_hyst = TEMP_FROM_REG(data->temp1_crit) - val; i2c_smbus_write_word_data(client, LM92_REG_TEMP_HYST, swab16(TEMP_TO_REG(data->temp1_hyst))); + up(&data->update_lock); return count; } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/max1619.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/max1619.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/max1619.c 2005-03-23 06:34:25.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/max1619.c 2005-03-27 12:55:14.000000000 +1000 @@ -141,8 +141,11 @@ struct i2c_client *client = to_i2c_client(dev); \ struct max1619_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->value = TEMP_TO_REG(val); \ i2c_smbus_write_byte_data(client, reg, data->value); \ + up(&data->update_lock); \ return count; \ } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/pc87360.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/pc87360.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/pc87360.c 2005-03-23 06:34:26.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/pc87360.c 2005-03-27 12:55:14.000000000 +1000 @@ -259,6 +259,7 @@ struct pc87360_data *data = i2c_get_clientdata(client); long fan_min = simple_strtol(buf, NULL, 10); + down(&data->update_lock); fan_min = FAN_TO_REG(fan_min, FAN_DIV_FROM_REG(data->fan_status[nr])); /* If it wouldn't fit, change clock divisor */ @@ -275,6 +276,7 @@ /* Write new divider, preserve alarm bits */ pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_FAN_STATUS(nr), data->fan_status[nr] & 0xF9); + up(&data->update_lock); return count; } @@ -336,10 +338,13 @@ struct i2c_client *client = to_i2c_client(dev); \ struct pc87360_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->pwm[offset-1] = PWM_TO_REG(val, \ FAN_CONFIG_INVERT(data->fan_conf, offset-1)); \ pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_PWM(offset-1), \ data->pwm[offset-1]); \ + up(&data->update_lock); \ return count; \ } \ static DEVICE_ATTR(pwm##offset, S_IWUSR | S_IRUGO, \ @@ -378,9 +383,12 @@ struct i2c_client *client = to_i2c_client(dev); \ struct pc87360_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->in_min[offset] = IN_TO_REG(val, data->in_vref); \ pc87360_write_value(data, LD_IN, offset, PC87365_REG_IN_MIN, \ data->in_min[offset]); \ + up(&data->update_lock); \ return count; \ } \ static ssize_t set_in##offset##_max(struct device *dev, const char *buf, \ @@ -389,10 +397,13 @@ struct i2c_client *client = to_i2c_client(dev); \ struct pc87360_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->in_max[offset] = IN_TO_REG(val, \ data->in_vref); \ pc87360_write_value(data, LD_IN, offset, PC87365_REG_IN_MAX, \ data->in_max[offset]); \ + up(&data->update_lock); \ return count; \ } \ static DEVICE_ATTR(in##offset##_input, S_IRUGO, \ @@ -451,9 +462,12 @@ struct i2c_client *client = to_i2c_client(dev); \ struct pc87360_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->in_min[offset+7] = IN_TO_REG(val, data->in_vref); \ pc87360_write_value(data, LD_IN, offset+7, PC87365_REG_TEMP_MIN, \ data->in_min[offset+7]); \ + up(&data->update_lock); \ return count; \ } \ static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \ @@ -462,9 +476,12 @@ struct i2c_client *client = to_i2c_client(dev); \ struct pc87360_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->in_max[offset+7] = IN_TO_REG(val, data->in_vref); \ pc87360_write_value(data, LD_IN, offset+7, PC87365_REG_TEMP_MAX, \ data->in_max[offset+7]); \ + up(&data->update_lock); \ return count; \ } \ static ssize_t set_temp##offset##_crit(struct device *dev, const char *buf, \ @@ -473,9 +490,12 @@ struct i2c_client *client = to_i2c_client(dev); \ struct pc87360_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->in_crit[offset-4] = IN_TO_REG(val, data->in_vref); \ pc87360_write_value(data, LD_IN, offset+7, PC87365_REG_TEMP_CRIT, \ data->in_crit[offset-4]); \ + up(&data->update_lock); \ return count; \ } \ static DEVICE_ATTR(temp##offset##_input, S_IRUGO, \ @@ -552,9 +572,12 @@ struct i2c_client *client = to_i2c_client(dev); \ struct pc87360_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->temp_min[offset-1] = TEMP_TO_REG(val); \ pc87360_write_value(data, LD_TEMP, offset-1, PC87365_REG_TEMP_MIN, \ data->temp_min[offset-1]); \ + up(&data->update_lock); \ return count; \ } \ static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \ @@ -563,9 +586,12 @@ struct i2c_client *client = to_i2c_client(dev); \ struct pc87360_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->temp_max[offset-1] = TEMP_TO_REG(val); \ pc87360_write_value(data, LD_TEMP, offset-1, PC87365_REG_TEMP_MAX, \ data->temp_max[offset-1]); \ + up(&data->update_lock); \ return count; \ } \ static ssize_t set_temp##offset##_crit(struct device *dev, const char *buf, \ @@ -574,9 +600,12 @@ struct i2c_client *client = to_i2c_client(dev); \ struct pc87360_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->temp_crit[offset-1] = TEMP_TO_REG(val); \ pc87360_write_value(data, LD_TEMP, offset-1, PC87365_REG_TEMP_CRIT, \ data->temp_crit[offset-1]); \ + up(&data->update_lock); \ return count; \ } \ static DEVICE_ATTR(temp##offset##_input, S_IRUGO, \ diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/pcf8591.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/pcf8591.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/pcf8591.c 2005-03-23 06:34:26.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/pcf8591.c 2005-03-27 12:55:14.000000000 +1000 @@ -124,8 +124,11 @@ struct i2c_client *client = to_i2c_client(dev); struct pcf8591_data *data = i2c_get_clientdata(client); if ((value = (simple_strtoul(buf, NULL, 10) + 5) / 10) <= 255) { + + down(&data->update_lock); data->aout = value; i2c_smbus_write_byte_data(client, data->control, data->aout); + up(&data->update_lock); return count; } return -EINVAL; @@ -144,11 +147,15 @@ { struct i2c_client *client = to_i2c_client(dev); struct pcf8591_data *data = i2c_get_clientdata(client); - if (simple_strtoul(buf, NULL, 10)) + long val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); + if (val) data->control |= PCF8591_CONTROL_AOEF; else data->control &= ~PCF8591_CONTROL_AOEF; i2c_smbus_write_byte(client, data->control); + up(&data->update_lock); return count; } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/sis5595.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/sis5595.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/sis5595.c 2005-03-23 06:34:26.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/sis5595.c 2005-03-27 12:55:14.000000000 +1000 @@ -232,8 +232,11 @@ struct i2c_client *client = to_i2c_client(dev); struct sis5595_data *data = i2c_get_clientdata(client); unsigned long val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); data->in_min[nr] = IN_TO_REG(val); sis5595_write_value(client, SIS5595_REG_IN_MIN(nr), data->in_min[nr]); + up(&data->update_lock); return count; } @@ -243,8 +246,11 @@ struct i2c_client *client = to_i2c_client(dev); struct sis5595_data *data = i2c_get_clientdata(client); unsigned long val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); data->in_max[nr] = IN_TO_REG(val); sis5595_write_value(client, SIS5595_REG_IN_MAX(nr), data->in_max[nr]); + up(&data->update_lock); return count; } @@ -305,8 +311,11 @@ struct i2c_client *client = to_i2c_client(dev); struct sis5595_data *data = i2c_get_clientdata(client); long val = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); data->temp_over = TEMP_TO_REG(val); sis5595_write_value(client, SIS5595_REG_TEMP_OVER, data->temp_over); + up(&data->update_lock); return count; } @@ -321,8 +330,11 @@ struct i2c_client *client = to_i2c_client(dev); struct sis5595_data *data = i2c_get_clientdata(client); long val = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); data->temp_hyst = TEMP_TO_REG(val); sis5595_write_value(client, SIS5595_REG_TEMP_HYST, data->temp_hyst); + up(&data->update_lock); return count; } @@ -353,8 +365,11 @@ struct i2c_client *client = to_i2c_client(dev); struct sis5595_data *data = i2c_get_clientdata(client); unsigned long val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr])); sis5595_write_value(client, SIS5595_REG_FAN_MIN(nr), data->fan_min[nr]); + up(&data->update_lock); return count; } @@ -373,10 +388,14 @@ { struct i2c_client *client = to_i2c_client(dev); struct sis5595_data *data = i2c_get_clientdata(client); - unsigned long min = FAN_FROM_REG(data->fan_min[nr], - DIV_FROM_REG(data->fan_div[nr])); + unsigned long min; unsigned long val = simple_strtoul(buf, NULL, 10); - int reg = sis5595_read_value(client, SIS5595_REG_FANDIV); + int reg; + + down(&data->update_lock); + min = FAN_FROM_REG(data->fan_min[nr], + DIV_FROM_REG(data->fan_div[nr])); + reg = sis5595_read_value(client, SIS5595_REG_FANDIV); switch (val) { case 1: data->fan_div[nr] = 0; break; case 2: data->fan_div[nr] = 1; break; @@ -385,6 +404,7 @@ default: dev_err(&client->dev, "fan_div value %ld not " "supported. Choose one of 1, 2, 4 or 8!\n", val); + up(&data->update_lock); return -EINVAL; } @@ -400,6 +420,7 @@ data->fan_min[nr] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr])); sis5595_write_value(client, SIS5595_REG_FAN_MIN(nr), data->fan_min[nr]); + up(&data->update_lock); return count; } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/smsc47m1.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/smsc47m1.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/smsc47m1.c 2005-03-23 06:34:26.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/smsc47m1.c 2005-03-27 12:55:14.000000000 +1000 @@ -195,16 +195,20 @@ { struct i2c_client *client = to_i2c_client(dev); struct smsc47m1_data *data = i2c_get_clientdata(client); + long rpmdiv, val = simple_strtol(buf, NULL, 10); - long rpmdiv = simple_strtol(buf, NULL, 10) - * DIV_FROM_REG(data->fan_div[nr]); + down(&data->update_lock); + rpmdiv = val * DIV_FROM_REG(data->fan_div[nr]); - if (983040 > 192 * rpmdiv || 2 * rpmdiv > 983040) + if (983040 > 192 * rpmdiv || 2 * rpmdiv > 983040) { + up(&data->update_lock); return -EINVAL; + } data->fan_preload[nr] = 192 - ((983040 + rpmdiv / 2) / rpmdiv); smsc47m1_write_value(client, SMSC47M1_REG_FAN_PRELOAD(nr), data->fan_preload[nr]); + up(&data->update_lock); return count; } @@ -224,12 +228,16 @@ if (new_div == old_div) /* No change */ return count; + + down(&data->update_lock); switch (new_div) { case 1: data->fan_div[nr] = 0; break; case 2: data->fan_div[nr] = 1; break; case 4: data->fan_div[nr] = 2; break; case 8: data->fan_div[nr] = 3; break; - default: return -EINVAL; + default: + up(&data->update_lock); + return -EINVAL; } tmp = smsc47m1_read_value(client, SMSC47M1_REG_FANDIV) & 0x0F; @@ -242,6 +250,7 @@ data->fan_preload[nr] = SENSORS_LIMIT(tmp, 0, 191); smsc47m1_write_value(client, SMSC47M1_REG_FAN_PRELOAD(nr), data->fan_preload[nr]); + up(&data->update_lock); return count; } @@ -257,11 +266,14 @@ if (val < 0 || val > 255) return -EINVAL; + down(&data->update_lock); data->pwm[nr] &= 0x81; /* Preserve additional bits */ data->pwm[nr] |= PWM_TO_REG(val); smsc47m1_write_value(client, SMSC47M1_REG_PWM(nr), data->pwm[nr]); + up(&data->update_lock); + return count; } @@ -276,11 +288,13 @@ if (val != 0 && val != 1) return -EINVAL; + down(&data->update_lock); data->pwm[nr] &= 0xFE; /* preserve the other bits */ data->pwm[nr] |= !val; smsc47m1_write_value(client, SMSC47M1_REG_PWM(nr), data->pwm[nr]); + up(&data->update_lock); return count; } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/via686a.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/via686a.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/via686a.c 2005-03-23 06:34:26.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/via686a.c 2005-03-27 12:55:14.000000000 +1000 @@ -363,9 +363,12 @@ struct i2c_client *client = to_i2c_client(dev); struct via686a_data *data = i2c_get_clientdata(client); unsigned long val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); data->in_min[nr] = IN_TO_REG(val,nr); via686a_write_value(client, VIA686A_REG_IN_MIN(nr), data->in_min[nr]); + up(&data->update_lock); return count; } static ssize_t set_in_max(struct device *dev, const char *buf, @@ -373,9 +376,12 @@ struct i2c_client *client = to_i2c_client(dev); struct via686a_data *data = i2c_get_clientdata(client); unsigned long val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); data->in_max[nr] = IN_TO_REG(val,nr); via686a_write_value(client, VIA686A_REG_IN_MAX(nr), data->in_max[nr]); + up(&data->update_lock); return count; } #define show_in_offset(offset) \ @@ -434,8 +440,11 @@ struct i2c_client *client = to_i2c_client(dev); struct via686a_data *data = i2c_get_clientdata(client); int val = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); data->temp_over[nr] = TEMP_TO_REG(val); via686a_write_value(client, VIA686A_REG_TEMP_OVER(nr), data->temp_over[nr]); + up(&data->update_lock); return count; } static ssize_t set_temp_hyst(struct device *dev, const char *buf, @@ -443,8 +452,11 @@ struct i2c_client *client = to_i2c_client(dev); struct via686a_data *data = i2c_get_clientdata(client); int val = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); data->temp_hyst[nr] = TEMP_TO_REG(val); via686a_write_value(client, VIA686A_REG_TEMP_HYST(nr), data->temp_hyst[nr]); + up(&data->update_lock); return count; } #define show_temp_offset(offset) \ @@ -502,8 +514,11 @@ struct i2c_client *client = to_i2c_client(dev); struct via686a_data *data = i2c_get_clientdata(client); int val = simple_strtol(buf, NULL, 10); + + down(&data->update_lock); data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr])); via686a_write_value(client, VIA686A_REG_FAN_MIN(nr+1), data->fan_min[nr]); + up(&data->update_lock); return count; } static ssize_t set_fan_div(struct device *dev, const char *buf, @@ -511,10 +526,14 @@ struct i2c_client *client = to_i2c_client(dev); struct via686a_data *data = i2c_get_clientdata(client); int val = simple_strtol(buf, NULL, 10); - int old = via686a_read_value(client, VIA686A_REG_FANDIV); + int old; + + down(&data->update_lock); + old = via686a_read_value(client, VIA686A_REG_FANDIV); data->fan_div[nr] = DIV_TO_REG(val); old = (old & 0x0f) | (data->fan_div[1] << 6) | (data->fan_div[0] << 4); via686a_write_value(client, VIA686A_REG_FANDIV, old); + up(&data->update_lock); return count; } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/w83627hf.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/w83627hf.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/w83627hf.c 2005-03-26 07:26:41.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/w83627hf.c 2005-03-27 12:55:14.000000000 +1000 @@ -354,10 +354,13 @@ u32 val; \ \ val = simple_strtoul(buf, NULL, 10); \ + \ + down(&data->update_lock); \ data->in_##reg[nr] = IN_TO_REG(val); \ w83627hf_write_value(client, W83781D_REG_IN_##REG(nr), \ data->in_##reg[nr]); \ \ + up(&data->update_lock); \ return count; \ } store_in_reg(MIN, min) @@ -442,6 +445,9 @@ u32 val; val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); + if ((data->vrm_ovt & 0x01) && (w83627thf == data->type || w83637hf == data->type)) @@ -452,6 +458,7 @@ data->in_min[0] = IN_TO_REG(val); w83627hf_write_value(client, W83781D_REG_IN_MIN(0), data->in_min[0]); + up(&data->update_lock); return count; } @@ -463,6 +470,9 @@ u32 val; val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); + if ((data->vrm_ovt & 0x01) && (w83627thf == data->type || w83637hf == data->type)) @@ -473,6 +483,7 @@ data->in_max[0] = IN_TO_REG(val); w83627hf_write_value(client, W83781D_REG_IN_MAX(0), data->in_max[0]); + up(&data->update_lock); return count; } @@ -508,11 +519,14 @@ u32 val; val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); data->fan_min[nr - 1] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr - 1])); w83627hf_write_value(client, W83781D_REG_FAN_MIN(nr), data->fan_min[nr - 1]); + up(&data->update_lock); return count; } @@ -574,6 +588,8 @@ \ val = simple_strtoul(buf, NULL, 10); \ \ + down(&data->update_lock); \ + \ if (nr >= 2) { /* TEMP2 and TEMP3 */ \ data->temp_##reg##_add[nr-2] = LM75_TEMP_TO_REG(val); \ w83627hf_write_value(client, W83781D_REG_TEMP_##REG(nr), \ @@ -584,6 +600,7 @@ data->temp_##reg); \ } \ \ + up(&data->update_lock); \ return count; \ } store_temp_reg(OVER, max); @@ -692,6 +709,8 @@ val = simple_strtoul(buf, NULL, 10); + down(&data->update_lock); + if (update_mask == BEEP_MASK) { /* We are storing beep_mask */ data->beep_mask = BEEP_MASK_TO_REG(val); w83627hf_write_value(client, W83781D_REG_BEEP_INTS1, @@ -708,6 +727,7 @@ w83627hf_write_value(client, W83781D_REG_BEEP_INTS2, val2 | data->beep_enable << 7); + up(&data->update_lock); return count; } @@ -753,6 +773,8 @@ unsigned long min; u8 reg; + down(&data->update_lock); + /* Save fan_min */ min = FAN_FROM_REG(data->fan_min[nr], DIV_FROM_REG(data->fan_div[nr])); @@ -773,6 +795,7 @@ data->fan_min[nr] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr])); w83627hf_write_value(client, W83781D_REG_FAN_MIN(nr+1), data->fan_min[nr]); + up(&data->update_lock); return count; } @@ -815,6 +838,8 @@ val = simple_strtoul(buf, NULL, 10); + down(&data->update_lock); + if (data->type == w83627thf) { /* bits 0-3 are reserved in 627THF */ data->pwm[nr - 1] = PWM_TO_REG(val) & 0xf0; @@ -830,6 +855,7 @@ data->pwm[nr - 1]); } + up(&data->update_lock); return count; } @@ -871,6 +897,8 @@ val = simple_strtoul(buf, NULL, 10); + down(&data->update_lock); + switch (val) { case 1: /* PII/Celeron diode */ tmp = w83627hf_read_value(client, W83781D_REG_SCFG1); @@ -903,6 +931,7 @@ break; } + up(&data->update_lock); return count; } diff -Nru linux-2.6.12-rc1-mm3/drivers/i2c/chips/w83781d.c linux-2.6.12-rc1-mm3a/drivers/i2c/chips/w83781d.c --- linux-2.6.12-rc1-mm3/drivers/i2c/chips/w83781d.c 2005-03-23 06:34:26.000000000 +1100 +++ linux-2.6.12-rc1-mm3a/drivers/i2c/chips/w83781d.c 2005-03-27 12:55:14.000000000 +1000 @@ -302,9 +302,12 @@ u32 val; \ \ val = simple_strtoul(buf, NULL, 10) / 10; \ + \ + down(&data->update_lock); \ data->in_##reg[nr] = IN_TO_REG(val); \ w83781d_write_value(client, W83781D_REG_IN_##REG(nr), data->in_##reg[nr]); \ \ + up(&data->update_lock); \ return count; \ } store_in_reg(MIN, min); @@ -369,11 +372,14 @@ u32 val; val = simple_strtoul(buf, NULL, 10); + + down(&data->update_lock); data->fan_min[nr - 1] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr - 1])); w83781d_write_value(client, W83781D_REG_FAN_MIN(nr), data->fan_min[nr - 1]); + up(&data->update_lock); return count; } @@ -432,6 +438,8 @@ \ val = simple_strtol(buf, NULL, 10); \ \ + down(&data->update_lock); \ + \ if (nr >= 2) { /* TEMP2 and TEMP3 */ \ data->temp_##reg##_add[nr-2] = LM75_TEMP_TO_REG(val); \ w83781d_write_value(client, W83781D_REG_TEMP_##REG(nr), \ @@ -442,6 +450,7 @@ data->temp_##reg); \ } \ \ + up(&data->update_lock); \ return count; \ } store_temp_reg(OVER, max); @@ -554,6 +563,8 @@ val = simple_strtoul(buf, NULL, 10); + down(&data->update_lock); + if (update_mask == BEEP_MASK) { /* We are storing beep_mask */ data->beep_mask = BEEP_MASK_TO_REG(val, data->type); w83781d_write_value(client, W83781D_REG_BEEP_INTS1, @@ -573,6 +584,7 @@ w83781d_write_value(client, W83781D_REG_BEEP_INTS2, val2 | data->beep_enable << 7); + up(&data->update_lock); return count; } @@ -616,6 +628,8 @@ unsigned long min; u8 reg; + down(&data->update_lock); + /* Save fan_min */ min = FAN_FROM_REG(data->fan_min[nr], DIV_FROM_REG(data->fan_div[nr])); @@ -640,6 +654,7 @@ data->fan_min[nr] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr])); w83781d_write_value(client, W83781D_REG_FAN_MIN(nr+1), data->fan_min[nr]); + up(&data->update_lock); return count; } @@ -686,9 +701,12 @@ val = simple_strtoul(buf, NULL, 10); + down(&data->update_lock); + data->pwm[nr - 1] = PWM_TO_REG(val); w83781d_write_value(client, W83781D_REG_PWM(nr), data->pwm[nr - 1]); + up(&data->update_lock); return count; } @@ -701,6 +719,8 @@ val = simple_strtoul(buf, NULL, 10); + down(&data->update_lock); + switch (val) { case 0: case 1: @@ -716,9 +736,11 @@ break; default: + up(&data->update_lock); return -EINVAL; } + up(&data->update_lock); return count; } @@ -780,6 +802,8 @@ val = simple_strtoul(buf, NULL, 10); + down(&data->update_lock); + switch (val) { case 1: /* PII/Celeron diode */ tmp = w83781d_read_value(client, W83781D_REG_SCFG1); @@ -811,6 +835,7 @@ break; } + up(&data->update_lock); return count; } @@ -859,6 +884,8 @@ struct w83781d_data *data = i2c_get_clientdata(client); u32 val, i; + down(&data->update_lock); + for (i = 0; i < count; i++) { val = simple_strtoul(buf + count, NULL, 10); @@ -869,6 +896,7 @@ data->rt[nr - 1][i]); } + up(&data->update_lock); return count; }
