diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
| commit | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch) | |
| tree | ad8cc17bfd3b5e57e36f07a249028667d72f0b96 /drivers/w1/w1.c | |
| parent | ba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff) | |
| parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'drivers/w1/w1.c')
| -rw-r--r-- | drivers/w1/w1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index b460927ec32a..312cf3220f12 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c | |||
| @@ -646,7 +646,7 @@ static int w1_control(void *data) | |||
| 646 | while (!control_needs_exit || have_to_wait) { | 646 | while (!control_needs_exit || have_to_wait) { |
| 647 | have_to_wait = 0; | 647 | have_to_wait = 0; |
| 648 | 648 | ||
| 649 | try_to_freeze(PF_FREEZE); | 649 | try_to_freeze(); |
| 650 | msleep_interruptible(w1_timeout * 1000); | 650 | msleep_interruptible(w1_timeout * 1000); |
| 651 | 651 | ||
| 652 | if (signal_pending(current)) | 652 | if (signal_pending(current)) |
| @@ -725,7 +725,7 @@ int w1_process(void *data) | |||
| 725 | allow_signal(SIGTERM); | 725 | allow_signal(SIGTERM); |
| 726 | 726 | ||
| 727 | while (!test_bit(W1_MASTER_NEED_EXIT, &dev->flags)) { | 727 | while (!test_bit(W1_MASTER_NEED_EXIT, &dev->flags)) { |
| 728 | try_to_freeze(PF_FREEZE); | 728 | try_to_freeze(); |
| 729 | msleep_interruptible(w1_timeout * 1000); | 729 | msleep_interruptible(w1_timeout * 1000); |
| 730 | 730 | ||
| 731 | if (signal_pending(current)) | 731 | if (signal_pending(current)) |