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

[pandora-kernel.git] / drivers / media / video / ivtv / ivtv-ioctl.c

diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index a17c659..fa9f0d9 100644 (file)
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -1850,8 +1850,9 @@ static long ivtv_serialized_ioctl(struct ivtv *itv, struct file *filp,
        case VIDIOC_S_AUDOUT:
        case VIDIOC_S_EXT_CTRLS:
        case VIDIOC_S_FBUF:
+       case VIDIOC_S_PRIORITY:
        case VIDIOC_OVERLAY:
-               ret = v4l2_prio_check(&itv->prio, &id->prio);
+               ret = v4l2_prio_check(&itv->prio, id->prio);
                if (ret)
                        return ret;
        }