Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 58095
b: refs/heads/master
c: 33e44b1
h: refs/heads/master
i:
  58093: 11ae551
  58091: 144fb6e
  58087: 25b6785
  58079: 249547a
v: v3
  • Loading branch information
Evgeniy Polyakov authored and Linus Torvalds committed Jun 28, 2007
1 parent cd036da commit 786c144
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 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: a66e356c04ece4a96f44b942b68234c3de8ec3f5
refs/heads/master: 33e44b158821cc703f99d43d87579a2fe819ce7b
6 changes: 1 addition & 5 deletions trunk/drivers/w1/slaves/w1_therm.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,7 @@ static ssize_t w1_therm_read_bin(struct kobject *kobj, char *buf, loff_t off, si

w1_write_8(dev, W1_CONVERT_TEMP);

while (tm) {
tm = msleep_interruptible(tm);
if (signal_pending(current))
flush_signals(current);
}
msleep(tm);

if (!w1_reset_select_slave(sl)) {

Expand Down

0 comments on commit 786c144

Please sign in to comment.