Prev: i2c-s3c2410: Decrease delay after end of transaction
Next: ATTN
From: Ian Dall on 19 Apr 2010 08:50
Bug 12646 has been outstanding for a long time. Is it possible to get
this fix committed?


Log:
From: Ian Dall <ian(a)beware.dropbear.id.au>

Fix regression caused by commit
507e2fbaaacb6f164b4125b87c5002f95143174b,
whereby negative temperatures for the DS18B20 are not converted
properly. Fixes bug 12646.

Signed-of-by: Ian Dall <ian(a)beware.dropbear.id.au>


diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index 1ed3d55..17726a0 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -115,9 +115,8 @@ static struct w1_therm_family_converter w1_therm_families[] = {

static inline int w1_DS18B20_convert_temp(u8 rom[9])
{
- int t = ((s16)rom[1] << 8) | rom[0];
- t = t*1000/16;
- return t;
+ s16 t = le16_to_cpup((__le16 *)rom);
+ return t*1000/16;
}

static inline int w1_DS18S20_convert_temp(u8 rom[9])


--
Ian Dall <ian(a)beware.dropbear.id.au>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: i2c-s3c2410: Decrease delay after end of transaction
Next: ATTN