Commit 2bcbeeb2 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: Simplify atomisp_s_input() input argument checking 



Simplify the checking of the input argument to atomisp_s_input():
- Remove the check for input >= ATOM_ISP_MAX_INPUTS, input_cnt
  never is > ATOM_ISP_MAX_INPUTS so checking only that is sufficient
- Remove the unnecessary camera local variable
- Move the 2 invalid argument checks to above the atomisp_pipe_check()
  which checks if the pipe is busy or not

Reviewed-by: default avatarAndy Shevchenko <andy@kernel.org>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 1a1ce0c3

drivers/staging/media/atomisp/pci/atomisp_ioctl.c

+6 −12
Original line number Diff line number Diff line
@@ -449,23 +449,17 @@ static int atomisp_s_input(struct file *file, void *fh, unsigned int input) 
	struct video_device *vdev = video_devdata(file);

	struct atomisp_device *isp = video_get_drvdata(vdev);

	struct atomisp_video_pipe *pipe = atomisp_to_video_pipe(vdev);

	struct v4l2_subdev *camera = NULL;

	int ret;



	ret = atomisp_pipe_check(pipe, true);

	if (ret)

		return ret;



	if (input >= ATOM_ISP_MAX_INPUTS || input >= isp->input_cnt) {

		dev_dbg(isp->dev, "input_cnt: %d\n", isp->input_cnt);

	if (input >= isp->input_cnt)

		return -EINVAL;

	}



	camera = isp->inputs[input].camera;

	if (!camera) {

		dev_err(isp->dev, "%s, no camera\n", __func__);

	if (!isp->inputs[input].camera)

		return -EINVAL;

	}



	ret = atomisp_pipe_check(pipe, true);

	if (ret)

		return ret;



	return atomisp_select_input(isp, input);

}