aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-01-14 00:05:59 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-03-23 17:28:13 -0800
commitf73b5e7949945486a649e40821cd351e2f60bf02 (patch)
tree283ac7ae169d3341a300330404301bfc85059b80
parent[PATCH] W1: Remove incorrect MODULE_ALIAS (diff)
downloadlinux-dev-f73b5e7949945486a649e40821cd351e2f60bf02.tar.xz
linux-dev-f73b5e7949945486a649e40821cd351e2f60bf02.zip
[PATCH] W1: u64 is not long long
You don't know what type a u64 is, hence you cannot print it without a cast. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/w1/w1.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 5def7fb903ac..d640c1e1f8cd 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -388,11 +388,14 @@ static int w1_uevent(struct device *dev, char **envp, int num_envp, char *buffer
if (dev->driver != &w1_slave_driver || !sl)
return 0;
- err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size, &cur_len, "W1_FID=%02X", sl->reg_num.family);
+ err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size,
+ &cur_len, "W1_FID=%02X", sl->reg_num.family);
if (err)
return err;
- err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size, &cur_len, "W1_SLAVE_ID=%024LX", (u64)sl->reg_num.id);
+ err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size,
+ &cur_len, "W1_SLAVE_ID=%024LX",
+ (unsigned long long)sl->reg_num.id);
if (err)
return err;