aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <[email protected]>2021-11-10 13:08:28 +0000
committerMauro Carvalho Chehab <[email protected]>2021-11-15 08:11:59 +0000
commit245f6f4a32fe7f60260f8ffdf4d5173bf3bebbca (patch)
tree4c05b923a156dd2a1ccc62b6d8c5b477735a425e
parent71665d816214124d6bc4eb80314ac8f84ecacd78 (diff)
media: atomisp: simplify asd check on open() fops
The open() fops support two types of devices: "acc" and normal ones. the acc works on a different way, using a different pipe struct. Not sure yet if it would make sense to setup a run_mode there. Also, As default_run_mode exists only on normal modes, we can simplify the logic to check if the device is in normal mode. That solves this warning: ../drivers/staging/media/atomisp/pci/atomisp_fops.c:904 atomisp_open() warn: variable dereferenced before check 'asd' (see line 807) Signed-off-by: Mauro Carvalho Chehab <[email protected]>
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp_fops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp_fops.c
index c7ac313a2edf..94ba8acf0e58 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_fops.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_fops.c
@@ -901,7 +901,7 @@ done:
rt_mutex_unlock(&isp->mutex);
/* Ensure that a mode is set */
- if (asd && pipe)
+ if (!acc_node)
v4l2_ctrl_s_ctrl(asd->run_mode, pipe->default_run_mode);
return 0;