From a8a0ff5448604099fc8a9af0cd4b19faa713ab24 Mon Sep 17 00:00:00 2001 From: Florian Faber Date: Wed, 2 Nov 2011 13:39:59 -0700 Subject: [PATCH] --- yaml --- r: 273273 b: refs/heads/master c: 68a436aec345c2bcd05dbdafae1f5f608ff8f61f h: refs/heads/master i: 273271: 916c179141f0ff39919cf7f1002f3f42f220ac7d v: v3 --- [refs] | 2 +- trunk/drivers/w1/w1_int.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 63ca02931b09..26e0257645f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e053fcbbbc4d945247cb32cad2767b483cb65f8 +refs/heads/master: 68a436aec345c2bcd05dbdafae1f5f608ff8f61f diff --git a/trunk/drivers/w1/w1_int.c b/trunk/drivers/w1/w1_int.c index d220bce2cee4..f79e62e54e8d 100644 --- a/trunk/drivers/w1/w1_int.c +++ b/trunk/drivers/w1/w1_int.c @@ -78,6 +78,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl, memcpy(&dev->dev, device, sizeof(struct device)); dev_set_name(&dev->dev, "w1_bus_master%u", dev->id); snprintf(dev->name, sizeof(dev->name), "w1_bus_master%u", dev->id); + dev->dev.init_name = dev->name; dev->driver = driver;