Merge branch 'master' into rrojo/vfio_plugin_refactor_enum

OFS · Jan 19, 2021 · 2224392 · 2224392
2 parents 00191af + 86282f4
commit 2224392
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/plugins/vfio/opae_vfio.c b/plugins/vfio/opae_vfio.c
@@ -1140,14 +1140,19 @@ fpga_result vfio_fpgaGetIOAddress(fpga_handle handle, uint64_t wsid,
 		return FPGA_EXCEPTION;
 	}
 	vfio_buffer *ptr = _vfio_buffers;
+	fpga_result res = FPGA_OK;
 	while (ptr) {
 		if (ptr->wsid == wsid) {
 			*ioaddr = ptr->iova;
-			return FPGA_OK;
+			goto out_unlock;
 		}
 		ptr = ptr->next;
 	}
-
-	return FPGA_NOT_FOUND;
+	res = FPGA_NOT_FOUND;
+out_unlock:
+	if (pthread_mutex_unlock(&_buffers_mutex)) {
+		OPAE_MSG("error unlocking buffers mutex");
+	}
+	return res;
 }