2004-09-23 23:53:57

by maximilian attems

[permalink] [raw]
Subject: [patch 17/21] media/saa7134-core: replace schedule_timeout() with msleep_interruptible()




Any comments would be appreciated.

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

Signed-off-by: Nishanth Aravamudan <[email protected]>

Signed-off-by: Maximilian Attems <[email protected]>
---

linux-2.6.9-rc2-bk7-max/drivers/media/video/saa7134/saa7134-core.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/media/video/saa7134/saa7134-core.c~msleep_interruptible-drivers_media_video_saa7134_saa7134-core drivers/media/video/saa7134/saa7134-core.c
--- linux-2.6.9-rc2-bk7/drivers/media/video/saa7134/saa7134-core.c~msleep_interruptible-drivers_media_video_saa7134_saa7134-core 2004-09-21 21:17:04.000000000 +0200
+++ linux-2.6.9-rc2-bk7-max/drivers/media/video/saa7134/saa7134-core.c 2004-09-21 21:17:04.000000000 +0200
@@ -27,6 +27,7 @@
#include <linux/kmod.h>
#include <linux/sound.h>
#include <linux/interrupt.h>
+#include <linux/delay.h>

#include "saa7134-reg.h"
#include "saa7134.h"
@@ -910,8 +911,7 @@ static int __devinit saa7134_initdev(str
}

/* wait a bit, register i2c bus */
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ/10);
+ msleep_interruptible(100);
saa7134_i2c_register(dev);

/* initialize hardware #2 */
_