Commit e43484e4 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: omap4iss: Don't check for missing get_fmt op on remote subdev 



The remote subdev of any video node in the OMAP4 ISS is an internal
subdev that is guaranteed to implement get_fmt. Don't check the return
value for -ENOIOCTLCMD, as this can't happen.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2b16b44a

drivers/staging/media/omap4iss/iss_video.c

+1 −3
Original line number Diff line number Diff line
@@ -248,8 +248,6 @@ __iss_video_get_format(struct iss_video *video, struct v4l2_format *format) 
	fmt.pad = pad;

	fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE;

	ret = v4l2_subdev_call(subdev, pad, get_fmt, NULL, &fmt);

	if (ret == -ENOIOCTLCMD)

		ret = -EINVAL;



	mutex_unlock(&video->mutex);
@@ -552,7 +550,7 @@ iss_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;



	iss_video_mbus_to_pix(video, &fmt.format, &format->fmt.pix);

	return 0;