]> err.no Git - linux-2.6/commitdiff
w1_therm_read_bin: don't call flush_signals()
authorEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Wed, 27 Jun 2007 21:10:04 +0000 (14:10 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 28 Jun 2007 18:38:19 +0000 (11:38 -0700)
This can disrupt userspace signal management.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Cc: Roland McGrath <roland@redhat.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/w1/slaves/w1_therm.c

index 732db4780042b6da2ecde6d7b7b2687c342cfc55..1a6937dc190b777369eac30ace6ea0aa665963bc 100644 (file)
@@ -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)) {