Commit 74d0b952 authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] zoran ioctl sleeping fixes.

From 2.4
parent af53fb8d
......@@ -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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment