diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-22 17:59:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-22 17:59:49 +0100 |
| commit | 2702e0a46c2d28da92b32c9b068ee1291fc0de35 (patch) | |
| tree | c1e9868a4b91beeebd5f4e820588bc2ae8371911 /drivers/w1 | |
| parent | 42bb8cc5e81028e217105299001070d57eb84ad7 (diff) | |
| parent | adfafefd104d840ee4461965f22624d77532675b (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'drivers/w1')
| -rw-r--r-- | drivers/w1/slaves/w1_therm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c index 2c8dff9f77d..1ed3d554e37 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -115,7 +115,7 @@ static struct w1_therm_family_converter w1_therm_families[] = { static inline int w1_DS18B20_convert_temp(u8 rom[9]) { - s16 t = (rom[1] << 8) | rom[0]; + int t = ((s16)rom[1] << 8) | rom[0]; t = t*1000/16; return t; } |