From b9ae1e629a34da4d13f39c032386056053c3f773 Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Sun, 13 Mar 2011 22:18:23 -0300 Subject: [PATCH] --- yaml --- r: 242077 b: refs/heads/master c: 228ee5928b5d4192a23cda3fdf755a956516c13e h: refs/heads/master i: 242075: 597d915d028010c259b7b7ff2adb8b355af33e81 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f69e66ac4c4e..f7783b2d4fa9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43823c02245a445b5669d43b1ec07b6d8ae710f5 +refs/heads/master: 228ee5928b5d4192a23cda3fdf755a956516c13e diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index 58617fc656c2..38761142a4d9 100644 --- a/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c @@ -795,12 +795,10 @@ static long pvr2_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) case VIDIOC_S_CROP: { struct v4l2_crop *crop = (struct v4l2_crop *)arg; - struct v4l2_cropcap cap; if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) { ret = -EINVAL; break; } - cap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; ret = pvr2_ctrl_set_value( pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPL), crop->c.left);