iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: atomisp: do not use err var when checking port validity for ISP2400

Browse Source 
Currently, the `port >= N_CSI_PORTS || err` checks for ISP2400 are always
evaluated as true because the err variable is set to `-EINVAL` on
declaration but the variable is never used until the evaluation.

Looking at the diff of commit 3c0538fbad9f ("media: atomisp: get rid of
most checks for ISP2401 version"), the `port >= N_CSI_PORTS` check is
for ISP2400 and the err variable check is for ISP2401. Fix this issue
by adding ISP version test there accordingly.

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>
This commit is contained in:
Tsuchiya Yuto 2021-10-18 01:19:44 +09:00 committed by Mauro Carvalho Chehab
parent e1921cd146
commit 9f6b4fa2d2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -430,7 +430,8 @@ allocate_mipi_frames(struct ia_css_pipe *pipe,
assert(port < N_CSI_PORTS);
if (port >= N_CSI_PORTS || err) {
if ((!IS_ISP2401 && port >= N_CSI_PORTS) ||
(IS_ISP2401 && err)) {
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"allocate_mipi_frames(%p) exit: error: port is not correct (port=%d).\n",
pipe, port);
@ -559,7 +560,8 @@ free_mipi_frames(struct ia_css_pipe *pipe)
assert(port < N_CSI_PORTS);
if (port >= N_CSI_PORTS || err) {
if ((!IS_ISP2401 && port >= N_CSI_PORTS) ||
(IS_ISP2401 && err)) {
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"free_mipi_frames(%p, %d) exit: error: pipe port is not correct.\n",
pipe, port);
@ -670,7 +672,8 @@ send_mipi_frames(struct ia_css_pipe *pipe)
assert(port < N_CSI_PORTS);
if (port >= N_CSI_PORTS || err) {
if ((!IS_ISP2401 && port >= N_CSI_PORTS) ||
(IS_ISP2401 && err)) {
IA_CSS_ERROR("send_mipi_frames(%p) exit: invalid port specified (port=%d).\n",
pipe, port);
return err;