Merge branch 'master' into for-next

[cascardo/linux.git] / drivers / media / video / pvrusb2 / pvrusb2-v4l2.c

diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 58617fc..3876114 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/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);