Commit 3aa059ae authored by Alex Dewar's avatar Alex Dewar Committed by Mauro Carvalho Chehab
Browse files

media: staging: media: atomisp: Remove unnecessary if statement 

The bodies of the if and else sections are the same, so just remove the
check.

Link: https://lore.kernel.org/linux-media/20201017142810.26967-2-alex.dewar90@gmail.com


Signed-off-by: default avatarAlex Dewar <alex.dewar90@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 32abe915

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

+6 −21
Original line number Diff line number Diff line
@@ -5407,28 +5407,13 @@ static int atomisp_set_fmt_to_isp(struct video_device *vdev, 
		return -EINVAL;

	}



	if (asd->continuous_mode->val &&

	    (configure_pp_input == atomisp_css_preview_configure_pp_input ||

	     configure_pp_input == atomisp_css_video_configure_pp_input)) {

		/* for isp 2.2, configure pp input is available for continuous

		 * mode */

		ret = configure_pp_input(asd, isp_sink_crop->width,

					 isp_sink_crop->height);

	ret = configure_pp_input(asd, isp_sink_crop->width, isp_sink_crop->height);

	if (ret) {

		dev_err(isp->dev, "configure_pp_input %ux%u\n",

			isp_sink_crop->width,

			isp_sink_crop->height);

		return -EINVAL;

	}

	} else {

		ret = configure_pp_input(asd, isp_sink_crop->width,

					 isp_sink_crop->height);

		if (ret) {

			dev_err(isp->dev, "configure_pp_input %ux%u\n",

				isp_sink_crop->width, isp_sink_crop->height);

			return -EINVAL;

		}

	}

	if (asd->copy_mode)

		ret = atomisp_css_copy_get_output_frame_info(asd, stream_index,

			output_info);