diff --git a/[refs] b/[refs] index 77e32276086a..e2c5c8f9ddbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe3cb82364332b9db3b574e9e41de9c27eff470a +refs/heads/master: e0d29c7699de723432da268748aefe9624fc8529 diff --git a/trunk/drivers/w1/slaves/w1_therm.c b/trunk/drivers/w1/slaves/w1_therm.c index 7de99dfd11c8..2c8dff9f77da 100644 --- a/trunk/drivers/w1/slaves/w1_therm.c +++ b/trunk/drivers/w1/slaves/w1_therm.c @@ -171,7 +171,7 @@ static ssize_t w1_therm_read(struct device *device, int i, max_trying = 10; ssize_t c = PAGE_SIZE; - mutex_lock(&sl->master->mutex); + mutex_lock(&dev->mutex); memset(rom, 0, sizeof(rom));