From cd0ea23e111ca545166fab6af16f77aa58bb7688 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sat, 14 Jan 2006 00:05:59 -0800 Subject: [PATCH] --- yaml --- r: 23357 b: refs/heads/master c: f73b5e7949945486a649e40821cd351e2f60bf02 h: refs/heads/master i: 23355: 6b29d154a2ac5ce2da2a81a43b5039d96bcac0ee v: v3 --- [refs] | 2 +- trunk/drivers/w1/w1.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1369aab2391b..34ae39e50389 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ecd5136c85cb4531a51f65241e7b3cd58420f3ed +refs/heads/master: f73b5e7949945486a649e40821cd351e2f60bf02 diff --git a/trunk/drivers/w1/w1.c b/trunk/drivers/w1/w1.c index 5def7fb903ac..d640c1e1f8cd 100644 --- a/trunk/drivers/w1/w1.c +++ b/trunk/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;