vivid: fix CROP_BOUNDS typo for video output
authorHans Verkuil <hverkuil@xs4all.nl>
Sat, 6 Dec 2014 10:30:03 +0000 (07:30 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Jan 2015 16:29:40 +0000 (08:29 -0800)
commit bb9ff078860f9d2f79d3a6bea3af9f48354ddb75 upstream.

An error was returned if composing was not supported, instead of if
cropping was not supported.

A classic copy-and-paste bug. Found with v4l2-compliance.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/platform/vivid/vivid-vid-out.c

index 69c2dbd2d1658c9c80f7a8d0e67d098b70c3fc3f..501d5ef682e58275698707e7f422c125359933f6 100644 (file)
@@ -612,7 +612,7 @@ int vivid_vid_out_g_selection(struct file *file, void *priv,
                sel->r = dev->fmt_out_rect;
                break;
        case V4L2_SEL_TGT_CROP_BOUNDS:
-               if (!dev->has_compose_out)
+               if (!dev->has_crop_out)
                        return -EINVAL;
                sel->r = vivid_max_rect;
                break;