diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 10:45:25 +0000 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 10:45:25 +0000 |
| commit | a23e66f3b8cfdedec14541e71ef29a754870a20c (patch) | |
| tree | f8ac23572982e92e6f8ae09c4039db627bdf53ee /drivers/w1/w1_int.c | |
| parent | 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab (diff) | |
| parent | ede6f5aea054d3fb67c78857f7abdee602302043 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
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 a3a54567bfb..4a46ed58ece 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, mutex_init(&dev->mutex); memcpy(&dev->dev, device, sizeof(struct device)); - snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id), - "w1_bus_master%u", dev->id); + dev_set_name(&dev->dev, "w1_bus_master%u", dev->id); snprintf(dev->name, sizeof(dev->name), "w1_bus_master%u", dev->id); dev->driver = driver; |