diff options
| author | Evgeniy Polyakov <johnpol@2ka.mipt.ru> | 2007-06-27 17:10:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-28 14:38:19 -0400 |
| commit | 33e44b158821cc703f99d43d87579a2fe819ce7b (patch) | |
| tree | 997133f612798302008ba49fc4b4a004f2a5868e /drivers/w1 | |
| parent | a66e356c04ece4a96f44b942b68234c3de8ec3f5 (diff) | |
w1_therm_read_bin: don't call flush_signals()
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>
Diffstat (limited to 'drivers/w1')
| -rw-r--r-- | drivers/w1/slaves/w1_therm.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c index 732db4780042..1a6937dc190b 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/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 | |||
| 191 | 191 | ||
| 192 | w1_write_8(dev, W1_CONVERT_TEMP); | 192 | w1_write_8(dev, W1_CONVERT_TEMP); |
| 193 | 193 | ||
| 194 | while (tm) { | 194 | msleep(tm); |
| 195 | tm = msleep_interruptible(tm); | ||
| 196 | if (signal_pending(current)) | ||
| 197 | flush_signals(current); | ||
| 198 | } | ||
| 199 | 195 | ||
| 200 | if (!w1_reset_select_slave(sl)) { | 196 | if (!w1_reset_select_slave(sl)) { |
| 201 | 197 | ||