Hello,
Please consider applying.
Description: Remove deprecated interruptible_sleep_on_timeout() function calls
and replace with direct wait-queue usage. Patch is compile-tested.
Signed-off-by: Nishanth Aravamudan <[EMAIL PROTECTED]>
--- 2.6.11-rc2-kj-v/drivers/media/video/zoran_card.c 2005-01-24
09:34:08.000000000 -0800
+++ 2.6.11-rc2-kj/drivers/media/video/zoran_card.c 2005-01-27
11:39:11.000000000 -0800
@@ -41,6 +41,7 @@
#include <linux/spinlock.h>
#include <linux/sem.h>
#include <linux/kmod.h>
+#include <linux/wait.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
@@ -968,6 +969,7 @@ zoran_open_init_params (struct zoran *zr
static void __devinit
test_interrupts (struct zoran *zr)
{
+ DEFINE_WAIT(wait);
int timeout, icr;
clear_interrupt_counters(zr);
@@ -975,7 +977,9 @@ test_interrupts (struct zoran *zr)
zr->testing = 1;
icr = btread(ZR36057_ICR);
btwrite(0x78000000 | ZR36057_ICR_IntPinEn, ZR36057_ICR);
- timeout = interruptible_sleep_on_timeout(&zr->test_q, 1 * HZ);
+ prepare_to_wait(&zr->test_q, &wait, TASK_INTERRUPTIBLE);
+ timeout = schedule_timeout(HZ);
+ finish_wait(&zr->test_q, &wait);
btwrite(0, ZR36057_ICR);
btwrite(0x78000000, ZR36057_ISR);
zr->testing = 0;
-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
Mjpeg-users mailing list
Mjpeg-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mjpeg-users
