Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb9ff078 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Cc: <stable@vger.kernel.org>      # for v3.18
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 5fdb9679

drivers/media/platform/vivid/vivid-vid-out.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -625,7 +625,7 @@ int vivid_vid_out_g_selection(struct file *file, void *priv, 
		sel->r = dev->fmt_out_rect;

		sel->r = dev->fmt_out_rect;

		break;

		break;

	case V4L2_SEL_TGT_CROP_BOUNDS:

	case V4L2_SEL_TGT_CROP_BOUNDS:

		if (!dev->has_compose_out)

		if (!dev->has_crop_out)

			return -EINVAL;

			return -EINVAL;

		sel->r = vivid_max_rect;

		sel->r = vivid_max_rect;

		break;

		break;