diff options
Diffstat (limited to 'drivers/w1/w1_int.c')
| -rw-r--r-- | drivers/w1/w1_int.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 68288355727a..5a98649f6abc 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c | |||
| @@ -76,6 +76,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl, | |||
| 76 | 76 | ||
| 77 | INIT_LIST_HEAD(&dev->slist); | 77 | INIT_LIST_HEAD(&dev->slist); |
| 78 | mutex_init(&dev->mutex); | 78 | mutex_init(&dev->mutex); |
| 79 | mutex_init(&dev->bus_mutex); | ||
| 79 | 80 | ||
| 80 | memcpy(&dev->dev, device, sizeof(struct device)); | 81 | memcpy(&dev->dev, device, sizeof(struct device)); |
| 81 | dev_set_name(&dev->dev, "w1_bus_master%u", dev->id); | 82 | dev_set_name(&dev->dev, "w1_bus_master%u", dev->id); |
| @@ -117,7 +118,7 @@ int w1_add_master_device(struct w1_bus_master *master) | |||
| 117 | return(-EINVAL); | 118 | return(-EINVAL); |
| 118 | } | 119 | } |
| 119 | /* While it would be electrically possible to make a device that | 120 | /* While it would be electrically possible to make a device that |
| 120 | * generated a strong pullup in bit bang mode, only hardare that | 121 | * generated a strong pullup in bit bang mode, only hardware that |
| 121 | * controls 1-wire time frames are even expected to support a strong | 122 | * controls 1-wire time frames are even expected to support a strong |
| 122 | * pullup. w1_io.c would need to support calling set_pullup before | 123 | * pullup. w1_io.c would need to support calling set_pullup before |
| 123 | * the last write_bit operation of a w1_write_8 which it currently | 124 | * the last write_bit operation of a w1_write_8 which it currently |