From 786c14458ad47a7608a18936f262a23a804ddc53 Mon Sep 17 00:00:00 2001
From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Date: Wed, 27 Jun 2007 14:10:04 -0700
Subject: [PATCH] --- yaml --- r: 58095 b: refs/heads/master c:
 33e44b158821cc703f99d43d87579a2fe819ce7b h: refs/heads/master i:   58093:
 11ae5514c66714c1709d2814e81ec90839099d54   58091:
 144fb6e06c8ecfd980e472706d066ce40c605c38   58087:
 25b67852eea9a68872b39a0ac7ece772506dea2c   58079:
 249547afedae42b34b58ed6985e39d2b513f21af v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/w1/slaves/w1_therm.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f8958bda4e2d..81017f84f742 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a66e356c04ece4a96f44b942b68234c3de8ec3f5
+refs/heads/master: 33e44b158821cc703f99d43d87579a2fe819ce7b
diff --git a/trunk/drivers/w1/slaves/w1_therm.c b/trunk/drivers/w1/slaves/w1_therm.c
index 732db4780042..1a6937dc190b 100644
--- a/trunk/drivers/w1/slaves/w1_therm.c
+++ b/trunk/drivers/w1/slaves/w1_therm.c
@@ -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)) {