diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/w1/slaves/w1_therm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c index 4318935678c..112f4ec5903 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c | |||
@@ -112,7 +112,7 @@ static struct w1_therm_family_converter w1_therm_families[] = { | |||
112 | 112 | ||
113 | static inline int w1_DS18B20_convert_temp(u8 rom[9]) | 113 | static inline int w1_DS18B20_convert_temp(u8 rom[9]) |
114 | { | 114 | { |
115 | int t = (rom[1] << 8) | rom[0]; | 115 | s16 t = (rom[1] << 8) | rom[0]; |
116 | t /= 16; | 116 | t /= 16; |
117 | return t; | 117 | return t; |
118 | } | 118 | } |
@@ -204,7 +204,7 @@ static ssize_t w1_therm_read_bin(struct kobject *kobj, | |||
204 | 204 | ||
205 | crc = w1_calc_crc8(rom, 8); | 205 | crc = w1_calc_crc8(rom, 8); |
206 | 206 | ||
207 | if (rom[8] == crc && rom[0]) | 207 | if (rom[8] == crc) |
208 | verdict = 1; | 208 | verdict = 1; |
209 | } | 209 | } |
210 | } | 210 | } |