git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
[pandora-kernel.git]
/
drivers
/
w1
/
slaves
/
w1_therm.c
diff --git
a/drivers/w1/slaves/w1_therm.c
b/drivers/w1/slaves/w1_therm.c
index
1ed3d55
..
17726a0
100644
(file)
--- 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])