diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-07 09:27:54 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-07 09:27:54 (GMT) |
| commit | 48652ced1533c3372f996a0d83b6e73b1f1c9381 (patch) | |
| tree | 5e17729cfcdc97bf798a17b57cdb888b4ded65b0 /drivers/w1 | |
| parent | 99bd5e2f245d8cd17d040c82d40becdb3efd9b69 (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
| download | linux-48652ced1533c3372f996a0d83b6e73b1f1c9381.tar.xz | |
Merge commit 'v2.6.34-rc6' into sched/core
Diffstat (limited to 'drivers/w1')
| -rw-r--r-- | drivers/w1/masters/omap_hdq.c | 1 | ||||
| -rw-r--r-- | drivers/w1/slaves/w1_therm.c | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c index ef36fca..3a7e9ff 100644 --- a/drivers/w1/masters/omap_hdq.c +++ b/drivers/w1/masters/omap_hdq.c @@ -16,6 +16,7 @@ #include <linux/err.h> #include <linux/clk.h> #include <linux/io.h> +#include <linux/sched.h> #include <asm/irq.h> #include <mach/hardware.h> 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]) |