sizeof(qp_cmd),
                               (struct efa_admin_acq_entry *)&cmd_completion,
                               sizeof(cmd_completion));
-       if (err)
+       if (err) {
                ibdev_err(edev->efa_dev, "Failed to destroy qp-%u [%d]\n",
                          qp_cmd.qp_handle, err);
+               return err;
+       }
 
        return 0;
 }
                               (struct efa_admin_acq_entry *)&destroy_resp,
                               sizeof(destroy_resp));
 
-       if (err)
+       if (err) {
                ibdev_err(edev->efa_dev, "Failed to destroy CQ-%u [%d]\n",
                          params->cq_idx, err);
+               return err;
+       }
 
        return 0;
 }
                               sizeof(mr_cmd),
                               (struct efa_admin_acq_entry *)&cmd_completion,
                               sizeof(cmd_completion));
-       if (err)
+       if (err) {
                ibdev_err(edev->efa_dev,
                          "Failed to de-register mr(lkey-%u) [%d]\n",
                          mr_cmd.l_key, err);
+               return err;
+       }
 
        return 0;
 }
                               sizeof(ah_cmd),
                               (struct efa_admin_acq_entry *)&cmd_completion,
                               sizeof(cmd_completion));
-       if (err)
+       if (err) {
                ibdev_err(edev->efa_dev, "Failed to destroy ah-%d pd-%d [%d]\n",
                          ah_cmd.ah, ah_cmd.pd, err);
+               return err;
+       }
 
        return 0;
 }
                               get_resp,
                               sizeof(*get_resp));
 
-       if (err)
+       if (err) {
                ibdev_err(edev->efa_dev,
                          "Failed to submit get_feature command %d [%d]\n",
                          feature_id, err);
+               return err;
+       }
 
        return 0;
 }
                               (struct efa_admin_acq_entry *)set_resp,
                               sizeof(*set_resp));
 
-       if (err)
+       if (err) {
                ibdev_err(edev->efa_dev,
                          "Failed to submit set_feature command %d error: %d\n",
                          feature_id, err);
+               return err;
+       }
 
        return 0;
 }