Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / drivers / staging / cx25821 / cx25821-vidups10.c

diff --git a/drivers/staging/cx25821/cx25821-vidups10.c b/drivers/staging/cx25821/cx25821-vidups10.c
index 89c8592..c746a17 100644 (file)
--- a/drivers/staging/cx25821/cx25821-vidups10.c
+++ b/drivers/staging/cx25821/cx25821-vidups10.c
@@ -201,7 +201,7 @@ static int video_release(struct file *file)
 
        videobuf_mmap_free(&fh->vidq);
 
-       v4l2_prio_close(&dev->prio, &fh->prio);
+       v4l2_prio_close(&dev->prio, fh->prio);
 
        file->private_data = NULL;
        kfree(fh);
@@ -299,7 +299,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
        int err;
 
        if (fh) {
-               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               err = v4l2_prio_check(&dev->prio, fh->prio);
                if (0 != err)
                        return err;
        }
@@ -347,7 +347,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
        int err;
 
        if (fh) {
-               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               err = v4l2_prio_check(&dev->prio, fh->prio);
                if (0 != err)
                        return err;
        }