Commit d21ce8c2 authored by Tsuchiya Yuto's avatar Tsuchiya Yuto Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: fix inverted error check for ia_css_mipi_is_source_port_valid() 



The function ia_css_mipi_is_source_port_valid() returns true if the port
is valid. So, we can't use the existing err variable as is.

To fix this issue while reusing that variable, invert the return value
when assigning it to the variable.

Fixes: 3c0538fb ("media: atomisp: get rid of most checks for ISP2401 version")
Signed-off-by: default avatarTsuchiya Yuto <kitakar@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 9f6b4fa2

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

+15 −9
Original line number Diff line number Diff line
@@ -423,10 +423,12 @@ allocate_mipi_frames(struct ia_css_pipe *pipe, 
		return 0; /* AM TODO: Check  */

	}



	if (!IS_ISP2401)

	if (!IS_ISP2401) {

		port = (unsigned int)pipe->stream->config.source.port.port;

	else

		err = ia_css_mipi_is_source_port_valid(pipe, &port);

	} else {

		/* Returns true if port is valid. So, invert it */

		err = !ia_css_mipi_is_source_port_valid(pipe, &port);

	}



	assert(port < N_CSI_PORTS);
@@ -553,10 +555,12 @@ free_mipi_frames(struct ia_css_pipe *pipe) 
			return err;

		}



		if (!IS_ISP2401)

		if (!IS_ISP2401) {

			port = (unsigned int)pipe->stream->config.source.port.port;

		else

			err = ia_css_mipi_is_source_port_valid(pipe, &port);

		} else {

			/* Returns true if port is valid. So, invert it */

			err = !ia_css_mipi_is_source_port_valid(pipe, &port);

		}



		assert(port < N_CSI_PORTS);
@@ -665,10 +669,12 @@ send_mipi_frames(struct ia_css_pipe *pipe) 
		/* TODO: AM: maybe this should be returning an error. */

	}



	if (!IS_ISP2401)

	if (!IS_ISP2401) {

		port = (unsigned int)pipe->stream->config.source.port.port;

	else

		err = ia_css_mipi_is_source_port_valid(pipe, &port);

	} else {

		/* Returns true if port is valid. So, invert it */

		err = !ia_css_mipi_is_source_port_valid(pipe, &port);

	}



	assert(port < N_CSI_PORTS);