FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-06 01:09:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[media] v4l2-ioctl: simplify code

Browse Source 
Instead of a big if at the beginning, just check if g_selection == NULL
and call the cropcap op immediately and return the result.

No functional changes in this patch.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Hans Verkuil 2016-02-29 07:16:39 -03:00 committed by Mauro Carvalho Chehab
parent 9765a32cd8
commit 54ace1cfd4
1 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/v4l2-core/v4l2-ioctl.c
View File

@ -2160,11 +2160,19 @@ static int v4l_cropcap(const struct v4l2_ioctl_ops *ops,
struct file *file, void *fh, void *arg) struct file *file, void *fh, void *arg)
{ {
struct v4l2_cropcap *p = arg; struct v4l2_cropcap *p = arg;
if (ops->vidioc_g_selection) {
struct v4l2_selection s = { .type = p->type }; struct v4l2_selection s = { .type = p->type };
int ret; int ret;
if (ops->vidioc_g_selection == NULL) {
/*
* The determine_valid_ioctls() call already should ensure
* that ops->vidioc_cropcap != NULL, but just in case...
*/
if (ops->vidioc_cropcap)
return ops->vidioc_cropcap(file, fh, p);
return -ENOTTY;
}
/* obtaining bounds */ /* obtaining bounds */
if (V4L2_TYPE_IS_OUTPUT(p->type)) if (V4L2_TYPE_IS_OUTPUT(p->type))
s.target = V4L2_SEL_TGT_COMPOSE_BOUNDS; s.target = V4L2_SEL_TGT_COMPOSE_BOUNDS;
@ -2186,7 +2194,6 @@ static int v4l_cropcap(const struct v4l2_ioctl_ops *ops,
if (ret) if (ret)
return ret; return ret;
p->defrect = s.r; p->defrect = s.r;
}
/* setting trivial pixelaspect */ /* setting trivial pixelaspect */
p->pixelaspect.numerator = 1; p->pixelaspect.numerator = 1;