summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/msp3400-driver.c5
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-tvaudio.c5
-rw-r--r--linux/drivers/media/video/vivi.c5
3 files changed, 0 insertions, 15 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index 5e209a36b..f3ddd462c 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -391,13 +391,8 @@ int msp_sleep(struct msp_state *state, int timeout)
set_current_state(TASK_INTERRUPTIBLE);
schedule();
} else {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
schedule_timeout_interruptible
(msecs_to_jiffies(timeout));
-#else
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(msecs_to_jiffies(timeout));
-#endif
}
}
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12)) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
diff --git a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c
index 981fcbd77..f0d037475 100644
--- a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -363,13 +363,8 @@ static int tvaudio_sleep(struct saa7134_dev *dev, int timeout)
set_current_state(TASK_INTERRUPTIBLE);
schedule();
} else {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
schedule_timeout_interruptible
(msecs_to_jiffies(timeout));
-#else
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(msecs_to_jiffies(timeout));
-#endif
}
}
remove_wait_queue(&dev->thread.wq, &wait);
diff --git a/linux/drivers/media/video/vivi.c b/linux/drivers/media/video/vivi.c
index 614cdc60e..092045d5b 100644
--- a/linux/drivers/media/video/vivi.c
+++ b/linux/drivers/media/video/vivi.c
@@ -524,12 +524,7 @@ static void vivi_sleep(struct vivi_dmaqueue *dma_q)
vivi_thread_tick(dma_q);
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
schedule_timeout_interruptible (timeout);
-#else
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(timeout);
-#endif
}
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12)) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
if (current->flags & PF_FREEZE) {