summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/vlib/linux/pci.c2
-rw-r--r--src/vnet/lisp-cp/one_api.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/vlib/linux/pci.c b/src/vlib/linux/pci.c
index 8af1cdab0d4..722fb888117 100644
--- a/src/vlib/linux/pci.c
+++ b/src/vlib/linux/pci.c
@@ -1137,7 +1137,7 @@ vlib_pci_map_region_int (vlib_main_t * vm, vlib_pci_dev_handle_t h,
if (*result == (void *) -1)
{
error = clib_error_return_unix (0, "mmap `BAR%u'", bar);
- if (p->type == LINUX_PCI_DEVICE_TYPE_UIO)
+ if (p->type == LINUX_PCI_DEVICE_TYPE_UIO && (fd != -1))
close (fd);
return error;
}
diff --git a/src/vnet/lisp-cp/one_api.c b/src/vnet/lisp-cp/one_api.c
index 912b9dffd0e..f7a972be7a2 100644
--- a/src/vnet/lisp-cp/one_api.c
+++ b/src/vnet/lisp-cp/one_api.c
@@ -1119,7 +1119,7 @@ one_adjacency_copy (vl_api_one_adjacency_t * dst, lisp_adjacency_t * adjs)
a.leid.address.nsh.si = gid_address_nsh_si (&adj->leid);
break;
default:
- ASSERT (0);
+ ALWAYS_ASSERT (0);
}
a.reid.type = eid_type;
a.leid.type = eid_type;