VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / media / video / zoran_driver.c

diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index 6785211..28f1a8d 100644 (file)
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -424,17 +424,15 @@ v4l_fbuffer_alloc (struct file *file)
                                                ZR_DEVNAME(zr), size >> 10);
                                        return -ENOBUFS;
                                }
-                               fh->v4l_buffers.buffer[0].fbuffer = 0;
-                               fh->v4l_buffers.buffer[0].fbuffer_phys =
-                                   pmem;
-                               fh->v4l_buffers.buffer[0].fbuffer_bus =
-                                   pmem;
+                               fh->v4l_buffers.buffer[0].fbuffer = NULL;
+                               fh->v4l_buffers.buffer[0].fbuffer_phys = pmem;
+                               fh->v4l_buffers.buffer[0].fbuffer_bus = pmem;
                                dprintk(4,
                                        KERN_INFO
                                        "%s: v4l_fbuffer_alloc() - using %d KB high memory\n",
                                        ZR_DEVNAME(zr), size >> 10);
                        } else {
-                               fh->v4l_buffers.buffer[i].fbuffer = 0;
+                               fh->v4l_buffers.buffer[i].fbuffer = NULL;
                                fh->v4l_buffers.buffer[i].fbuffer_phys =
                                    pmem + i * fh->v4l_buffers.buffer_size;
                                fh->v4l_buffers.buffer[i].fbuffer_bus =
@@ -1472,7 +1470,7 @@ zoran_close (struct inode *inode,
 
 static ssize_t
 zoran_read (struct file *file,
-           char        *data,
+           char        __user *data,
            size_t       count,
            loff_t      *ppos)
 {
@@ -1483,7 +1481,7 @@ zoran_read (struct file *file,
 
 static ssize_t
 zoran_write (struct file *file,
-            const char  *data,
+            const char  __user *data,
             size_t       count,
             loff_t      *ppos)
 {
@@ -1569,9 +1567,9 @@ setup_window (struct file       *file,
              int                y,
              int                width,
              int                height,
-             struct video_clip *clips,
+             struct video_clip __user *clips,
              int                clipcount,
-             void              *bitmap)
+             void              __user *bitmap)
 {
        struct zoran_fh *fh = file->private_data;
        struct zoran *zr = fh->zr;
@@ -2873,7 +2871,7 @@ zoran_do_ioctl (struct inode *inode,
                                         fmt->fmt.win.w.top,
                                         fmt->fmt.win.w.width,
                                         fmt->fmt.win.w.height,
-                                        (struct video_clip *)
+                                        (struct video_clip __user *)
                                           fmt->fmt.win.clips,
                                         fmt->fmt.win.clipcount,
                                         fmt->fmt.win.bitmap);