UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: atomisp: Remove unneeded null check 

In ia_css_frame_map, the check of 'err' is unneeded to be done twice.

Link: https://lore.kernel.org/linux-media/20211110094910.67951-1-vulab@iscas.ac.cn
Signed-off-by: Xu Wang <vulab@iscas.ac.cn>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Xu Wang 2021-11-10 09:49:10 +00:00 committed by Mauro Carvalho Chehab
parent b467d97ff3
commit 352ff3f3d4
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c
View File

@ -168,26 +168,24 @@ int ia_css_frame_map(struct ia_css_frame **frame,
if (err) if (err)
return err; return err;
if (!err) { if (pgnr < ((PAGE_ALIGN(me->data_bytes)) >> PAGE_SHIFT)) {
if (pgnr < ((PAGE_ALIGN(me->data_bytes)) >> PAGE_SHIFT)) { dev_err(atomisp_dev,
dev_err(atomisp_dev, "user space memory size is less than the expected size..\n");
"user space memory size is less than the expected size..\n"); err = -ENOMEM;
err = -ENOMEM; goto error;
goto error; } else if (pgnr > ((PAGE_ALIGN(me->data_bytes)) >> PAGE_SHIFT)) {
} else if (pgnr > ((PAGE_ALIGN(me->data_bytes)) >> PAGE_SHIFT)) { dev_err(atomisp_dev,
dev_err(atomisp_dev, "user space memory size is large than the expected size..\n");
"user space memory size is large than the expected size..\n"); err = -ENOMEM;
err = -ENOMEM; goto error;
goto error;
}
me->data = hmm_alloc(me->data_bytes, HMM_BO_USER, 0, data,
attribute & ATOMISP_MAP_FLAG_CACHED);
if (me->data == mmgr_NULL)
err = -EINVAL;
} }
me->data = hmm_alloc(me->data_bytes, HMM_BO_USER, 0, data,
attribute & ATOMISP_MAP_FLAG_CACHED);
if (me->data == mmgr_NULL)
err = -EINVAL;
error: error:
if (err) { if (err) {
kvfree(me); kvfree(me);