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

[ Upstream commit d21ce8c2f7bf6d737b60c09f86db141b9e8e47f0 ]

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: 3c0538fbad9f ("media: atomisp: get rid of most checks for ISP2401 version")
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/staging/media/atomisp/pci/sh_css_mipi.c b/drivers/staging/media/atomisp/pci/sh_css_mipi.c
index 34b71c1b7c1ec52b99bc11f3a6150b867e3f8e2f..651eda0469b23eed8d090752f819d7c7657e19dc 100644 (file)
--- a/drivers/staging/media/atomisp/pci/sh_css_mipi.c
+++ b/drivers/staging/media/atomisp/pci/sh_css_mipi.c
@@ -439,10 +439,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);
 
@@ -572,10 +574,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);
 
@@ -685,10 +689,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);