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>

diff --git a/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c b/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c
index 3c9dd5c0385053f9282cd530c7f55bad432597fe..e3242652f296212582396882c133647ac9bd6d0e 100644 (file)
--- a/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c
+++ b/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c
@@ -168,25 +168,23 @@ int ia_css_frame_map(struct ia_css_frame **frame,
        if (err)
                return err;
 
-       if (!err) {
-               if (pgnr < ((PAGE_ALIGN(me->data_bytes)) >> PAGE_SHIFT)) {
-                       dev_err(atomisp_dev,
-                               "user space memory size is less than the expected size..\n");
-                       err = -ENOMEM;
-                       goto error;
-               } else if (pgnr > ((PAGE_ALIGN(me->data_bytes)) >> PAGE_SHIFT)) {
-                       dev_err(atomisp_dev,
-                               "user space memory size is large than the expected size..\n");
-                       err = -ENOMEM;
-                       goto error;
-               }
+       if (pgnr < ((PAGE_ALIGN(me->data_bytes)) >> PAGE_SHIFT)) {
+               dev_err(atomisp_dev,
+                       "user space memory size is less than the expected size..\n");
+               err = -ENOMEM;
+               goto error;
+       } else if (pgnr > ((PAGE_ALIGN(me->data_bytes)) >> PAGE_SHIFT)) {
+               dev_err(atomisp_dev,
+                       "user space memory size is large than the expected size..\n");
+               err = -ENOMEM;
+               goto error;
+       }
 
-               me->data = hmm_alloc(me->data_bytes, HMM_BO_USER, 0, data,
-                                    attribute & ATOMISP_MAP_FLAG_CACHED);
+       me->data = hmm_alloc(me->data_bytes, HMM_BO_USER, 0, data,
+                            attribute & ATOMISP_MAP_FLAG_CACHED);
 
-               if (me->data == mmgr_NULL)
-                       err = -EINVAL;
-       }
+       if (me->data == mmgr_NULL)
+               err = -EINVAL;
 
 error:
        if (err) {