From f8eec935f3420e929bf756e145bf4bc0405c3f8e Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Wed, 16 Dec 2009 11:35:45 -0300 Subject: [PATCH] --- yaml --- r: 181482 b: refs/heads/master c: f2e6c6ad0207f22b55bb45a6b0958cecde3db8f1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/v4l2-compat-ioctl32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d1ae57ce440a..c84bc4898e96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66d9cbad5330d6df30c82f10ee18b62b096b84ef +refs/heads/master: f2e6c6ad0207f22b55bb45a6b0958cecde3db8f1 diff --git a/trunk/drivers/media/video/v4l2-compat-ioctl32.c b/trunk/drivers/media/video/v4l2-compat-ioctl32.c index c4150bd26337..dc7b8c23eac0 100644 --- a/trunk/drivers/media/video/v4l2-compat-ioctl32.c +++ b/trunk/drivers/media/video/v4l2-compat-ioctl32.c @@ -288,7 +288,7 @@ static int get_v4l2_window32(struct v4l2_window *kp, struct v4l2_window32 __user static int put_v4l2_window32(struct v4l2_window *kp, struct v4l2_window32 __user *up) { - if (copy_to_user(&up->w, &kp->w, sizeof(up->w)) || + if (copy_to_user(&up->w, &kp->w, sizeof(kp->w)) || put_user(kp->field, &up->field) || put_user(kp->chromakey, &up->chromakey) || put_user(kp->clipcount, &up->clipcount))