W1: split master mutex to avoid deadlocks.

[firefly-linux-kernel-4.4.55.git] / drivers / w1 / w1_int.c

diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index 68288355727a13377d97652727c97d448431b0b2..531434180afd1670cdd1db718615e0397cfdaf8a 100644 (file)
--- 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,
 
        INIT_LIST_HEAD(&dev->slist);
        mutex_init(&dev->mutex);
+       mutex_init(&dev->bus_mutex);
 
        memcpy(&dev->dev, device, sizeof(struct device));
        dev_set_name(&dev->dev, "w1_bus_master%u", dev->id);