Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
hwmon: (f75375s) Remove unnecessary and confusing initialization
hwmon: (it87) Properly decode -128 degrees C temperature
hwmon: (lm90) Document support for the MAX6648/6692 chips
hwmon: (abituguru3) Fix I/O error handling

+26 -13
+10
Documentation/hwmon/lm90
··· 42 42 Addresses scanned: I2C 0x4e 43 43 Datasheet: Publicly available at the Maxim website 44 44 http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497 45 + * Maxim MAX6648 46 + Prefix: 'max6646' 47 + Addresses scanned: I2C 0x4c 48 + Datasheet: Publicly available at the Maxim website 49 + http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3500 45 50 * Maxim MAX6649 46 51 Prefix: 'max6646' 47 52 Addresses scanned: I2C 0x4c ··· 79 74 0x4c, 0x4d and 0x4e 80 75 Datasheet: Publicly available at the Maxim website 81 76 http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3370 77 + * Maxim MAX6692 78 + Prefix: 'max6646' 79 + Addresses scanned: I2C 0x4c 80 + Datasheet: Publicly available at the Maxim website 81 + http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3500 82 82 83 83 84 84 Author: Jean Delvare <khali@linux-fr.org>
+2 -2
drivers/hwmon/Kconfig
··· 543 543 help 544 544 If you say yes here you get support for National Semiconductor LM90, 545 545 LM86, LM89 and LM99, Analog Devices ADM1032 and ADT7461, and Maxim 546 - MAX6646, MAX6647, MAX6649, MAX6657, MAX6658, MAX6659, MAX6680 and 547 - MAX6681 sensor chips. 546 + MAX6646, MAX6647, MAX6648, MAX6649, MAX6657, MAX6658, MAX6659, 547 + MAX6680, MAX6681 and MAX6692 sensor chips. 548 548 549 549 This driver can also be built as a module. If so, the module 550 550 will be called lm90.
+5 -2
drivers/hwmon/abituguru3.c
··· 760 760 761 761 for (i = 0; i < offset_count; i++) 762 762 if ((x = abituguru3_read(data, bank, offset + i, count, 763 - buf + i * count)) != count) 764 - return i * count + (i && (x < 0)) ? 0 : x; 763 + buf + i * count)) != count) { 764 + if (x < 0) 765 + return x; 766 + return i * count + x; 767 + } 765 768 766 769 return i * count; 767 770 }
+1 -1
drivers/hwmon/f75375s.c
··· 617 617 static int f75375_probe(struct i2c_client *client, 618 618 const struct i2c_device_id *id) 619 619 { 620 - struct f75375_data *data = i2c_get_clientdata(client); 620 + struct f75375_data *data; 621 621 struct f75375s_platform_data *f75375s_pdata = client->dev.platform_data; 622 622 int err; 623 623
+4 -4
drivers/hwmon/it87.c
··· 213 213 214 214 #define TEMP_TO_REG(val) (SENSORS_LIMIT(((val)<0?(((val)-500)/1000):\ 215 215 ((val)+500)/1000),-128,127)) 216 - #define TEMP_FROM_REG(val) (((val)>0x80?(val)-0x100:(val))*1000) 216 + #define TEMP_FROM_REG(val) ((val) * 1000) 217 217 218 218 #define PWM_TO_REG(val) ((val) >> 1) 219 219 #define PWM_FROM_REG(val) (((val)&0x7f) << 1) ··· 267 267 u8 has_fan; /* Bitfield, fans enabled */ 268 268 u16 fan[5]; /* Register values, possibly combined */ 269 269 u16 fan_min[5]; /* Register values, possibly combined */ 270 - u8 temp[3]; /* Register value */ 271 - u8 temp_high[3]; /* Register value */ 272 - u8 temp_low[3]; /* Register value */ 270 + s8 temp[3]; /* Register value */ 271 + s8 temp_high[3]; /* Register value */ 272 + s8 temp_low[3]; /* Register value */ 273 273 u8 sensor; /* Register value */ 274 274 u8 fan_div[3]; /* Register encoding, shifted right */ 275 275 u8 vid; /* Register encoding, combined */
+4 -4
drivers/hwmon/lm90.c
··· 32 32 * supported by this driver. These chips lack the remote temperature 33 33 * offset feature. 34 34 * 35 - * This driver also supports the MAX6646, MAX6647 and MAX6649 chips 36 - * made by Maxim. These are again similar to the LM86, but they use 37 - * unsigned temperature values and can report temperatures from 0 to 38 - * 145 degrees. 35 + * This driver also supports the MAX6646, MAX6647, MAX6648, MAX6649 and 36 + * MAX6692 chips made by Maxim. These are again similar to the LM86, 37 + * but they use unsigned temperature values and can report temperatures 38 + * from 0 to 145 degrees. 39 39 * 40 40 * This driver also supports the MAX6680 and MAX6681, two other sensor 41 41 * chips made by Maxim. These are quite similar to the other Maxim