diff options
Diffstat (limited to 'drivers/w1/w1_int.c')
-rw-r--r-- | drivers/w1/w1_int.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index a3a54567bfba..4a46ed58ece9 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c | |||
@@ -75,8 +75,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl, | |||
75 | mutex_init(&dev->mutex); | 75 | mutex_init(&dev->mutex); |
76 | 76 | ||
77 | memcpy(&dev->dev, device, sizeof(struct device)); | 77 | memcpy(&dev->dev, device, sizeof(struct device)); |
78 | snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id), | 78 | dev_set_name(&dev->dev, "w1_bus_master%u", dev->id); |
79 | "w1_bus_master%u", dev->id); | ||
80 | snprintf(dev->name, sizeof(dev->name), "w1_bus_master%u", dev->id); | 79 | snprintf(dev->name, sizeof(dev->name), "w1_bus_master%u", dev->id); |
81 | 80 | ||
82 | dev->driver = driver; | 81 | dev->driver = driver; |