Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 114929
b: refs/heads/master
c: 7dc8f52
h: refs/heads/master
i:
  114927: f40a52d
v: v3
  • Loading branch information
David Fries authored and Linus Torvalds committed Oct 16, 2008
1 parent dcb5c29 commit aa22c07
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: af00a2d5a047455b35d1e7dc4c7d9993c2bcfb93
refs/heads/master: 7dc8f527ef20bf95143dfbe2ecc01dc70b1e6ab7
6 changes: 3 additions & 3 deletions trunk/drivers/w1/w1.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ static void w1_slave_release(struct device *dev)
{
struct w1_slave *sl = dev_to_w1_slave(dev);

printk("%s: Releasing %s.\n", __func__, sl->name);
dev_dbg(dev, "%s: Releasing %s.\n", __func__, sl->name);

while (atomic_read(&sl->refcnt)) {
printk("Waiting for %s to become free: refcnt=%d.\n",
dev_dbg(dev, "Waiting for %s to become free: refcnt=%d.\n",
sl->name, atomic_read(&sl->refcnt));
if (msleep_interruptible(1000))
flush_signals(current);
Expand Down Expand Up @@ -920,7 +920,7 @@ void w1_search(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb
rn |= (tmp64 << i);

if (kthread_should_stop()) {
printk(KERN_INFO "Abort w1_search (exiting)\n");
dev_dbg(&dev->dev, "Abort w1_search\n");
return;
}
}
Expand Down

0 comments on commit aa22c07

Please sign in to comment.