On Sat, 9 Jul 2005, Chris Kennedy wrote:
This adds the recent patches for module auto load fixes and the chroma key
ioctl.
#0.3.6y: http://www.ivtv.tv/releases/ivtv-0.3/
Looking through the last two patches I noticed a typo on my part. I also
fixed a warning at the same time. Chris, please commit:
http://webcon.net/~rhardy/patches/ivtv-0.3.6y-fix-interruptible-and-warning.patch.bz2
diff -urNbBp ivtv-0.3.6y/driver/ivtv-kthreads.c.orig
ivtv-0.3.6y/driver/ivtv-kthreads.c
--- ivtv-0.3.6y/driver/ivtv-kthreads.c.orig 2005-07-05 10:09:09.000000000
-0400
+++ ivtv-0.3.6y/driver/ivtv-kthreads.c 2005-07-09 13:54:47.000000000 -0400
@@ -153,7 +153,6 @@ static int ivtv_dualwatch_kthread(void *
ivtv_dualwatch_init_kthread(ivtv);
for (;;) {
- interruptible_sleep_on_timeout(&kthread->queue, HZ);
prepare_to_wait(&kthread->queue, &wait, TASK_INTERRUPTIBLE);
schedule_timeout(HZ);
finish_wait(&kthread->queue, &wait);
diff -urNbBp ivtv-0.3.6y/driver/ivtv-streams.c.orig
ivtv-0.3.6y/driver/ivtv-streams.c
--- ivtv-0.3.6y/driver/ivtv-streams.c.orig 2005-07-09 14:00:58.000000000
-0400
+++ ivtv-0.3.6y/driver/ivtv-streams.c 2005-07-09 14:00:58.000000000 -0400
@@ -1313,6 +1313,7 @@ int ivtv_stop_all_captures(struct ivtv *
int ivtv_stop_capture(struct ivtv *itv, int type)
{
+ DECLARE_WAITQUEUE(wait, current);
struct ivtv_stream *st = ivtv_stream_safeget(
"ivtv_stop_capture", itv, type);
int cap_type;
@@ -1325,8 +1326,6 @@ int ivtv_stop_capture(struct ivtv *itv,
if (st == NULL)
return -EINVAL;
- DECLARE_WAITQUEUE(wait, current);
-
/* This function assumes that you are allowed to stop the capture
and that we are actually capturing */
Regards,
Rob
--
---------------------"Happiness is understanding."----------------------
Robert Hardy, B.Eng Computer Systems C.E.O. Webcon Inc.
rhardy <at> webcon <dot> ca GPG Key available (613) 276-7327
-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP,
AMD, and NVIDIA. To register visit http://www.hp.com/go/dualwebinar
_______________________________________________
ivtv-devel mailing list
ivtv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ivtv-devel
