From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 6 Dec 2014 10:30:03 +0000 (-0300)
Subject: [media] vivid: fix CROP_BOUNDS typo for video output
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bb9ff078860f9d2f79d3a6bea3af9f48354ddb75;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[media] vivid: fix CROP_BOUNDS typo for video output

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>
Cc: <stable@vger.kernel.org>      # for v3.18
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---

diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c
index ee5c3992b276..39ff79f6aa67 100644
--- a/drivers/media/platform/vivid/vivid-vid-out.c
+++ b/drivers/media/platform/vivid/vivid-vid-out.c
@@ -625,7 +625,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;