Commit 2dbcb6fb authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: media/i2c: don't return ENOTTY if SUBDEV_API is not set 



If CONFIG_VIDEO_V4L2_SUBDEV_API is not set, then it is still possible
to call set_fmt for V4L2_SUBDEV_FORMAT_TRY, the result is just not
stored. So return 0 instead of -ENOTTY.

Calling get_fmt with V4L2_SUBDEV_FORMAT_TRY should return -EINVAL
instead of -ENOTTY, after all the get_fmt functionality is still
present, just not supported for TRY.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 596a5a58

drivers/media/i2c/mt9m111.c

+1 −1
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ static int mt9m111_get_fmt(struct v4l2_subdev *sd, 
		format->format = *mf;

		return 0;

#else

		return -ENOTTY;

		return -EINVAL;

#endif

	}

drivers/media/i2c/ov2640.c

+1 −1
Original line number Diff line number Diff line
@@ -929,7 +929,7 @@ static int ov2640_get_fmt(struct v4l2_subdev *sd, 
		format->format = *mf;

		return 0;

#else

		return -ENOTTY;

		return -EINVAL;

#endif

	}

drivers/media/i2c/ov2659.c

+1 −3
Original line number Diff line number Diff line
@@ -1055,7 +1055,7 @@ static int ov2659_get_fmt(struct v4l2_subdev *sd, 
		mutex_unlock(&ov2659->lock);

		return 0;

#else

	return -ENOTTY;

		return -EINVAL;

#endif

	}
@@ -1131,8 +1131,6 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd, 
#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

		mf = v4l2_subdev_get_try_format(sd, cfg, fmt->pad);

		*mf = fmt->format;

#else

		ret = -ENOTTY;

#endif

	} else {

		s64 val;

drivers/media/i2c/ov2680.c

+1 −4
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ static int ov2680_get_fmt(struct v4l2_subdev *sd, 
#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

		fmt = v4l2_subdev_get_try_format(&sensor->sd, cfg, format->pad);

#else

		ret = -ENOTTY;

		ret = -EINVAL;

#endif

	} else {

		fmt = &sensor->fmt;
@@ -723,10 +723,7 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd, 
#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

		try_fmt = v4l2_subdev_get_try_format(sd, cfg, 0);

		format->format = *try_fmt;

#else

		ret = -ENOTTY;

#endif



		goto unlock;

	}

drivers/media/i2c/ov5695.c

+1 −4
Original line number Diff line number Diff line
@@ -823,9 +823,6 @@ static int ov5695_set_fmt(struct v4l2_subdev *sd, 
	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {

#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

		*v4l2_subdev_get_try_format(sd, cfg, fmt->pad) = fmt->format;

#else

		mutex_unlock(&ov5695->mutex);

		return -ENOTTY;

#endif

	} else {

		ov5695->cur_mode = mode;
@@ -856,7 +853,7 @@ static int ov5695_get_fmt(struct v4l2_subdev *sd, 
		fmt->format = *v4l2_subdev_get_try_format(sd, cfg, fmt->pad);

#else

		mutex_unlock(&ov5695->mutex);

		return -ENOTTY;

		return -EINVAL;

#endif

	} else {

		fmt->format.width = mode->width;