UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "[media] v4l2-ioctl: simplify code" 

There are some issues rised on this patch during patch review.
I ended by merging this one by mistake. So, let's revert it.

This reverts commit 54ace1cfd4.

Cc: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2016-04-13 19:08:55 -03:00
parent 6ad9ba9c14
commit c431cbbb44
1 changed files with 25 additions and 32 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,19 +2160,11 @@ static int v4l_cropcap(const struct v4l2_ioctl_ops *ops,
struct file *file, void *fh, void *arg)
{
struct v4l2_cropcap *p = arg;
if (ops->vidioc_g_selection) {
struct v4l2_selection s = { .type = p->type };
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 */
if (V4L2_TYPE_IS_OUTPUT(p->type))
s.target = V4L2_SEL_TGT_COMPOSE_BOUNDS;
@ -2194,6 +2186,7 @@ static int v4l_cropcap(const struct v4l2_ioctl_ops *ops,
if (ret)
return ret;
p->defrect = s.r;
}
/* setting trivial pixelaspect */
p->pixelaspect.numerator = 1;