Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 318193
b: refs/heads/master
c: dd0aa67
h: refs/heads/master
i:
  318191: ad6d4ab
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Jun 13, 2012
1 parent f50beb2 commit b4ed573
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 526be41625a8b2282d5720dcb19f927edbf193b4
refs/heads/master: dd0aa67cd7cf3f4a3ca52ecc1d6b82f3fad1352b
4 changes: 2 additions & 2 deletions trunk/drivers/w1/slaves/w1_bq27000.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ static int w1_bq27000_read(struct device *dev, unsigned int reg)
u8 val;
struct w1_slave *sl = container_of(dev->parent, struct w1_slave, dev);

mutex_lock(&sl->mutex);
mutex_lock(&sl->master->mutex);
w1_write_8(sl->master, HDQ_CMD_READ | reg);
val = w1_read_8(sl->master);
mutex_unlock(&sl->mutex);
mutex_unlock(&sl->master->mutex);

return val;
}
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/w1/w1.c
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,6 @@ static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
memcpy(&sl->reg_num, rn, sizeof(sl->reg_num));
atomic_set(&sl->refcnt, 0);
init_completion(&sl->released);
mutex_init(&sl->mutex);

spin_lock(&w1_flock);
f = w1_family_registered(rn->family);
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/w1/w1.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ struct w1_slave
void *family_data;
struct device dev;
struct completion released;
struct mutex mutex;
};

typedef void (*w1_slave_found_callback)(struct w1_master *, u64);
Expand Down

0 comments on commit b4ed573

Please sign in to comment.