Skip to content

Commit

Permalink
[media] omap3isp: Fix up ENOIOCTLCMD error handling
Browse files Browse the repository at this point in the history
At commit 07d106d, 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>
  • Loading branch information
Wanlong Gao authored and Mauro Carvalho Chehab committed Sep 27, 2012
1 parent 254ee2e commit a694f1b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/media/platform/omap3isp/ispvideo.c
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ isp_video_try_format(struct file *file, void *fh, struct v4l2_format *format)
fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE;
ret = v4l2_subdev_call(subdev, pad, get_fmt, NULL, &fmt);
if (ret)
return ret == -ENOIOCTLCMD ? -EINVAL : ret;
return ret == -ENOIOCTLCMD ? -ENOTTY : ret;

isp_video_mbus_to_pix(video, &fmt.format, &format->fmt.pix);
return 0;
Expand All @@ -754,7 +754,7 @@ isp_video_cropcap(struct file *file, void *fh, struct v4l2_cropcap *cropcap)
ret = v4l2_subdev_call(subdev, video, cropcap, cropcap);
mutex_unlock(&video->mutex);

return ret == -ENOIOCTLCMD ? -EINVAL : ret;
return ret == -ENOIOCTLCMD ? -ENOTTY : ret;
}

static int
Expand All @@ -781,7 +781,7 @@ isp_video_get_crop(struct file *file, void *fh, struct v4l2_crop *crop)
format.which = V4L2_SUBDEV_FORMAT_ACTIVE;
ret = v4l2_subdev_call(subdev, pad, get_fmt, NULL, &format);
if (ret < 0)
return ret == -ENOIOCTLCMD ? -EINVAL : ret;
return ret == -ENOIOCTLCMD ? -ENOTTY : ret;

crop->c.left = 0;
crop->c.top = 0;
Expand All @@ -806,7 +806,7 @@ isp_video_set_crop(struct file *file, void *fh, struct v4l2_crop *crop)
ret = v4l2_subdev_call(subdev, video, s_crop, crop);
mutex_unlock(&video->mutex);

return ret == -ENOIOCTLCMD ? -EINVAL : ret;
return ret == -ENOIOCTLCMD ? -ENOTTY : ret;
}

static int
Expand Down

0 comments on commit a694f1b

Please sign in to comment.