Re: [PATCH] I2C update for 2.6.10-rc1

Greg KH
2004-11-09T05:50:17Z

ChangeSet 1.2014.1.3, 2004/11/05 13:39:29-08:00, johnpol@2ka.mipt.ru

[PATCH] w1/w1_family: replace schedule_timeout() with msleep_interruptible()

Description: Use msleep_interruptible() instead of schedule_timeout() to
guarantee the task delays as expected.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

drivers/w1/w1_family.c | 4 +---
1 files changed, 1 insertion(+), 3 deletions(-)

diff -Nru a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c
--- a/drivers/w1/w1_family.c 2004-11-08 18:56:15 -08:00
+++ b/drivers/w1/w1_family.c 2004-11-08 18:56:15 -08:00
@@ -87,10 +87,8 @@
while (atomic_read(&fent->refcnt)) {
printk(KERN_INFO "Waiting for family %u to become free: refcnt=%d.\n",
fent->fid, atomic_read(&fent->refcnt));
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ);

- if (signal_pending(current))
+ if (msleep_interruptible(1000))
flush_signals(current);
}
}