diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:03:22 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:03:22 +0800 |
| commit | cda2b9481445e798669f00fb8275d595f1ff943f (patch) | |
| tree | b70f5c939c38f61ca7258746f125ddc901466508 /drivers/media/v4l2-core/v4l2-compat-ioctl32.c | |
| parent | 9173606ce35faae345352f97cdae0579c3d05c4a (diff) | |
| parent | 10def3a6779924f7bb130200b8b940caf2914111 (diff) | |
Merge tag 'v4.4.89' into linux-linaro-lsk-v4.4lsk-v4.4-17.09
This is the 4.4.89 stable release
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-compat-ioctl32.c')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c index 109f687d1cbd..4379b949bb93 100644 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c @@ -773,7 +773,8 @@ static int put_v4l2_event32(struct v4l2_event *kp, struct v4l2_event32 __user *u copy_to_user(&up->u, &kp->u, sizeof(kp->u)) || put_user(kp->pending, &up->pending) || put_user(kp->sequence, &up->sequence) || - compat_put_timespec(&kp->timestamp, &up->timestamp) || + put_user(kp->timestamp.tv_sec, &up->timestamp.tv_sec) || + put_user(kp->timestamp.tv_nsec, &up->timestamp.tv_nsec) || put_user(kp->id, &up->id) || copy_to_user(up->reserved, kp->reserved, 8 * sizeof(__u32))) return -EFAULT; |