openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] v4l: omap4iss: Translate -ENOIOCTLCMD to -ENOTTY 

Translating -ENOIOCTLCMD to -EINVAL is invalid, the correct ioctl return
value is -ENOTTY.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Laurent Pinchart 2013-11-03 20:28:24 -03:00 committed by Mauro Carvalho Chehab
parent e43484e42d
commit 4a62361f82
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/media/omap4iss/iss_video.c
View File

@ -571,7 +571,7 @@ iss_video_cropcap(struct file *file, void *fh, struct v4l2_cropcap *cropcap)
ret = v4l2_subdev_call(subdev, video, cropcap, cropcap); ret = v4l2_subdev_call(subdev, video, cropcap, cropcap);
mutex_unlock(&video->mutex); mutex_unlock(&video->mutex);
return ret == -ENOIOCTLCMD ? -EINVAL : ret; return ret == -ENOIOCTLCMD ? -ENOTTY : ret;
} }
static int static int
@ -598,7 +598,7 @@ iss_video_get_crop(struct file *file, void *fh, struct v4l2_crop *crop)
format.which = V4L2_SUBDEV_FORMAT_ACTIVE; format.which = V4L2_SUBDEV_FORMAT_ACTIVE;
ret = v4l2_subdev_call(subdev, pad, get_fmt, NULL, &format); ret = v4l2_subdev_call(subdev, pad, get_fmt, NULL, &format);
if (ret < 0) if (ret < 0)
return ret == -ENOIOCTLCMD ? -EINVAL : ret; return ret == -ENOIOCTLCMD ? -ENOTTY : ret;
crop->c.left = 0; crop->c.left = 0;
crop->c.top = 0; crop->c.top = 0;
@ -623,7 +623,7 @@ iss_video_set_crop(struct file *file, void *fh, const struct v4l2_crop *crop)
ret = v4l2_subdev_call(subdev, video, s_crop, crop); ret = v4l2_subdev_call(subdev, video, s_crop, crop);
mutex_unlock(&video->mutex); mutex_unlock(&video->mutex);
return ret == -ENOIOCTLCMD ? -EINVAL : ret; return ret == -ENOIOCTLCMD ? -ENOTTY : ret;
} }
static int static int