fixup! misc/cpp: add explicit cast of void* and change string concat …

…to accomodate C++
SamsungDS · May 8, 2024 · 54e9310 · 54e9310
1 parent 9241b3e
commit 54e9310
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/nvme/core.c b/src/nvme/core.c
@@ -655,7 +655,7 @@ int nvme_init(struct nvme_ctrl *ctrl, const char *bdf, const struct nvme_ctrl_op
 	}
 
 	memcpy(ctrl->serial, ((char*) vaddr) + NVME_IDENTIFY_CTRL_SERIAL_NUMBER, sizeof(ctrl->serial));
-	oacs = le16_to_cpu(*(leint16_t *)(((uint8_t*) vaddr) + NVME_IDENTIFY_CTRL_OACS));
+	oacs = le16_to_cpu(*(leint16_t *)(((uintptr_t) vaddr) + NVME_IDENTIFY_CTRL_OACS));
 
 	if (oacs & NVME_IDENTIFY_CTRL_OACS_DBCONFIG)
 		ret = nvme_init_dbconfig(ctrl);