Commit a694f1b2 authored by Wanlong Gao's avatar Wanlong Gao Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarWanlong Gao <gaowanlong@cn.fujitsu.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 254ee2e0

drivers/media/platform/omap3isp/ispvideo.c

+4 −4
Original line number Diff line number Diff line
@@ -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;
@@ -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
@@ -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;
@@ -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