diff options
author | Wanlong Gao <gaowanlong@cn.fujitsu.com> | 2012-08-27 03:23:15 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-09-27 12:47:55 -0400 |
commit | a694f1b2af4942a1e0026e7929b4f7c5c251f82d (patch) | |
tree | d0bce2bdc20f6811328c5e8b81909c06556a1b54 /drivers/media/platform/omap3isp | |
parent | 254ee2e02132c84ca252129eb893c3ef8bb3b77e (diff) |
[media] omap3isp: Fix up ENOIOCTLCMD error handling
At commit 07d106d0, Linus pointed out that ENOIOCTLCMD should be
translated as ENOTTY to user mode.
Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/omap3isp')
-rw-r--r-- | drivers/media/platform/omap3isp/ispvideo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c index c78f60a0220d..a0b737fecf13 100644 --- a/drivers/media/platform/omap3isp/ispvideo.c +++ b/drivers/media/platform/omap3isp/ispvideo.c | |||
@@ -733,7 +733,7 @@ isp_video_try_format(struct file *file, void *fh, struct v4l2_format *format) | |||
733 | fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE; | 733 | fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE; |
734 | ret = v4l2_subdev_call(subdev, pad, get_fmt, NULL, &fmt); | 734 | ret = v4l2_subdev_call(subdev, pad, get_fmt, NULL, &fmt); |
735 | if (ret) | 735 | if (ret) |
736 | return ret == -ENOIOCTLCMD ? -EINVAL : ret; | 736 | return ret == -ENOIOCTLCMD ? -ENOTTY : ret; |
737 | 737 | ||
738 | isp_video_mbus_to_pix(video, &fmt.format, &format->fmt.pix); | 738 | isp_video_mbus_to_pix(video, &fmt.format, &format->fmt.pix); |
739 | return 0; | 739 | return 0; |
@@ -754,7 +754,7 @@ isp_video_cropcap(struct file *file, void *fh, struct v4l2_cropcap *cropcap) | |||
754 | ret = v4l2_subdev_call(subdev, video, cropcap, cropcap); | 754 | ret = v4l2_subdev_call(subdev, video, cropcap, cropcap); |
755 | mutex_unlock(&video->mutex); | 755 | mutex_unlock(&video->mutex); |
756 | 756 | ||
757 | return ret == -ENOIOCTLCMD ? -EINVAL : ret; | 757 | return ret == -ENOIOCTLCMD ? -ENOTTY : ret; |
758 | } | 758 | } |
759 | 759 | ||
760 | static int | 760 | static int |
@@ -781,7 +781,7 @@ isp_video_get_crop(struct file *file, void *fh, struct v4l2_crop *crop) | |||
781 | format.which = V4L2_SUBDEV_FORMAT_ACTIVE; | 781 | format.which = V4L2_SUBDEV_FORMAT_ACTIVE; |
782 | ret = v4l2_subdev_call(subdev, pad, get_fmt, NULL, &format); | 782 | ret = v4l2_subdev_call(subdev, pad, get_fmt, NULL, &format); |
783 | if (ret < 0) | 783 | if (ret < 0) |
784 | return ret == -ENOIOCTLCMD ? -EINVAL : ret; | 784 | return ret == -ENOIOCTLCMD ? -ENOTTY : ret; |
785 | 785 | ||
786 | crop->c.left = 0; | 786 | crop->c.left = 0; |
787 | crop->c.top = 0; | 787 | crop->c.top = 0; |
@@ -806,7 +806,7 @@ isp_video_set_crop(struct file *file, void *fh, struct v4l2_crop *crop) | |||
806 | ret = v4l2_subdev_call(subdev, video, s_crop, crop); | 806 | ret = v4l2_subdev_call(subdev, video, s_crop, crop); |
807 | mutex_unlock(&video->mutex); | 807 | mutex_unlock(&video->mutex); |
808 | 808 | ||
809 | return ret == -ENOIOCTLCMD ? -EINVAL : ret; | 809 | return ret == -ENOIOCTLCMD ? -ENOTTY : ret; |
810 | } | 810 | } |
811 | 811 | ||
812 | static int | 812 | static int |