This is a multi-part message in MIME format.
Subject: [PATCH] [UBUNTU:drivers/ieee1394/video1394.c] Fix incorrect video1394
timestamps.
UpstreamStatus: Merged in 2.6.16
http://www.kernel.org/git/?p=linux/kernel/git/stable/linux-2.6.16.y.git;a=commitdiff;h=e4cda1654e5c0be4b68e29011e8dc04977286df9
Reference: Malone #41228
https://launchpad.net/distros/ubuntu/+source/linux-source-2.6.15/+bug/41228
This patch fixes the incoherent timestamps generated by video1394 since
the single-buffer patch was applied in 2.6.11. Credits have also been
removed from the header and a "//" comment was changed to "/* */".
Signed-off-by: Andrew Straw <strawman@xxxxxxxxxx>
---
drivers/ieee1394/video1394.c | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
27b369d94feff9527e81996e6e70449b49240488
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index 1692b07..fbe0f6c 100644
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -19,12 +19,6 @@
*
* NOTES:
*
- * jds -- add private data to file to keep track of iso contexts associated
- * with each open -- so release won't kill all iso transfers.
- *
- * Damien Douxchamps: Fix failure when the number of DMA pages per frame is
- * one.
- *
* ioctl return codes:
* EFAULT is only for invalid address for the argp
* EINVAL for out of range values
@@ -34,12 +28,6 @@
* ENOTTY for unsupported ioctl request
*
*/
-
-/* Markus Tavenrath <speedygoo@xxxxxxxxxxxx> :
- - fixed checks for valid buffer-numbers in video1394_icotl
- - changed the ways the dma prg's are used, now it's possible to use
- even a single dma buffer
-*/
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/list.h>
@@ -539,7 +527,7 @@ static void wakeup_dma_ir_ctx(unsigned l
if (d->ir_prg[i][d->nb_cmd-1].status & cpu_to_le32(0xFFFF0000))
{
reset_ir_status(d, i);
d->buffer_status[d->buffer_prg_assignment[i]] =
VIDEO1394_BUFFER_READY;
- do_gettimeofday(&d->buffer_time[i]);
+
do_gettimeofday(&d->buffer_time[d->buffer_prg_assignment[i]]);
}
}
@@ -1046,7 +1034,6 @@ static int __video1394_ioctl(struct file
/* set time of buffer */
v.filltime = d->buffer_time[v.buffer];
-// printk("Buffer %d time %d\n", v.buffer,
(d->buffer_time[v.buffer]).tv_usec);
/*
* Look ahead to see how many more buffers have been received
@@ -1104,7 +1091,7 @@ static int __video1394_ioctl(struct file
spin_lock_irqsave(&d->lock,flags);
- // last_buffer is last_prg
+ /* last_buffer is last_prg */
next_prg = (d->last_buffer + 1) % d->num_desc;
if (d->buffer_status[v.buffer]!=VIDEO1394_BUFFER_FREE) {
PRINT(KERN_ERR, ohci->host->id,
--
1.1.3
|
