[linux-dvb] Re: <PATCH> Fix for saa7146 in 2.6.10-rc1-bk22+

["C.Y.M" <syphir@syphir.sytes.net>]

C.Y.M wrote:
> This proposed patch will break the build for 2.6.10-rc1 to 2.6.10-rc1-bk21.
>
> This patch SHOULD work for 2.6.9 and 2.6.10-rc1-bk22+
>
> If someone with more experience with this code could check this, I would 
> appreciate it. :)  I am testing with 2.6.10-rc1-bk22, but have not 
> confirmed this to work with 2.6.9 yet.  Confirmation for both would be 
> great.
>
> Thanks.
The first patch set left out some conditionals in one of the files i had 
to edit.  Here is what I have now.  Also, this seems to build fine on 
2.6.10-rc1-bk22 but, as soon as I hit the remote control for vdr, I get 
an oops.  Ill have to look harder to see if I missed something in the ir 
code.

--- saa7146_fops.c.orig 2004-11-12 18:45:05.000000000 -0800
+++ saa7146_fops.c      2004-11-12 18:52:08.000000000 -0800
@@ -344,7 +344,11 @@
                BUG();
                return 0;
        }
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10))
        return videobuf_mmap_mapper(vma,q);
+#else
+       return videobuf_mmap_mapper(q,vma);
+#endif
 }

 static unsigned int fops_poll(struct file *file, struct 
poll_table_struct *wait)
@@ -358,9 +362,9 @@
        if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type) {
                if( 0 == fh->vbi_q.streaming )
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10))
-                       return videobuf_poll_stream(file, &fh->vbi_q, wait);
+                        return videobuf_poll_stream(file, 
file->private_data, &fh->vbi_q, wait);
 #else
-                       return videobuf_poll_stream(file, 
file->private_data, &fh->vbi_q, wait);
+                       return videobuf_poll_stream(file, &fh->vbi_q, wait);
 #endif
                q = &fh->vbi_q;
        } else {