[PATCH] zoran ioctl sleeping fixes.

From 2.4

[PATCH] zoran ioctl sleeping fixes.
From 2.4
74d0b952 · Dave Jones · Linus Torvalds · af53fb8d · 74d0b952
Commit 74d0b952 authored Jan 08, 2003 by Dave Jones Committed by Linus Torvalds Jan 08, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

drivers/media/video/zr36067.c drivers/media/video/zr36067.c +2 -4

No files found.
--- 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;
+			set_current_state(TASK_UNINTERRUPTIBLE);
-			while (jiffies < timeout)
+			schedule_timeout(HZ);
-				schedule();
 			/* Get status of video decoder */