armbian/linux-rockchip
0
0
Fork 0
mirror of https://github.com/armbian/linux-rockchip.git synced 2026-01-06 11:08:10 -08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit d21ce8c2f7 ]

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: 3c0538fbad ("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>
This commit is contained in:
Tsuchiya Yuto
2021-10-18 01:19:45 +09:00
committed by Greg Kroah-Hartman
parent 3cb3e66f58
commit 0bf5e8af6e
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/staging/media/atomisp/pci/sh_css_mipi.c
View File

@@ -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);