---

yaml --- r: 273273 b: refs/heads/master c: 68a436a h: refs/heads/master i: 273271: 916c179 v: v3
git-mirror · Nov 2, 2011 · a8a0ff5 · a8a0ff5
1 parent 28953ad
commit a8a0ff5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;