zoran: don't bother with struct file * in zoran_map

[deliverable/linux.git] / drivers / media / video / zoran / zoran_driver.c

diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index c573109318108cac4ffea8d27488943ab3b7bac8..c6ccdeb6d8d6e50bb0db8c624c97e7b19ca9b7ac 100644 (file)
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -2811,7 +2811,7 @@ static void
 zoran_vm_close (struct vm_area_struct *vma)
 {
        struct zoran_mapping *map = vma->vm_private_data;
-       struct zoran_fh *fh = map->file->private_data;
+       struct zoran_fh *fh = map->fh;
        struct zoran *zr = fh->zr;
        int i;
 
@@ -2938,7 +2938,7 @@ zoran_mmap (struct file           *file,
                res = -ENOMEM;
                goto mmap_unlock_and_return;
        }
-       map->file = file;
+       map->fh = fh;
        map->count = 1;
 
        vma->vm_ops = &zoran_vm_ops;