[PATCH] zoran ioctl sleeping fixes.

From 2.4

diff --git a/drivers/media/video/zr36067.c b/drivers/media/video/zr36067.c
index 70478175aaee6bfa2c96441dc20c58641d280af0..837aa11651f08745abead8f33ca50643a2db95b9 100644 (file)
--- a/drivers/media/video/zr36067.c
+++ b/drivers/media/video/zr36067.c
@@ -4158,7 +4158,6 @@ static int do_zoran_ioctl(struct zoran *zr, unsigned int cmd,
                {
                        struct zoran_status bs;
                        int norm, input, status;
-                       unsigned long timeout;
 
                        if (zr->codec_mode != BUZ_MODE_IDLE) {
                                DEBUG1(printk(KERN_ERR
@@ -4204,9 +4203,8 @@ static int do_zoran_ioctl(struct zoran *zr, unsigned int cmd,
 
                        /* sleep 1 second */
 
-                       timeout = jiffies + 1 * HZ;
-                       while (jiffies < timeout)
-                               schedule();
+                       set_current_state(TASK_UNINTERRUPTIBLE);
+                       schedule_timeout(HZ);
 
                        /* Get status of video decoder */